Hi ports@,
I just found out that productivity/vdirsyncer was not working because
one of its dependencies (devel/py-click-threading) was broken.
Here's a patch that updates deve/py-click-threading to its latest
version (0.5.0), which fixes the bug and another one that updates
productivity/vdirsyncer to 0.18.0. It seems that 0.19.0 exists for the
latter, but is not on pypi, only on their github repo.
Both build and work for me on amd64. vdirsyncer also has tests, which
all but one pass. That one is trying to make a network connection which
we do not allow when using PORTS_PRIVSEP.
Maintainer of vdirsyncer in CC
OK to commit ?
diff 8cce3d79ca0b6037c03c0e9a0af53ee7aa3688ac /usr/ports
blob - b40dc3f67afa571c913080f41219b9c0b3f895c3
file + devel/py-click-threading/Makefile
--- devel/py-click-threading/Makefile
+++ devel/py-click-threading/Makefile
@@ -2,10 +2,9 @@
COMMENT = multithreading in Python click
-MODPY_EGG_VERSION = 0.4.3
+MODPY_EGG_VERSION = 0.5.0
DISTNAME = click-threading-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 3
CATEGORIES = devel
blob - 1a28cb7c3c0629cf806555fd18268ab6ace27462
file + devel/py-click-threading/distinfo
--- devel/py-click-threading/distinfo
+++ devel/py-click-threading/distinfo
@@ -1,2 +1,2 @@
-SHA256 (click-threading-0.4.3.tar.gz) =
j5Gpq8i7QChzOOcFh79gQ0SYCKAijElv9O8DzcVbRHc=
-SIZE (click-threading-0.4.3.tar.gz) = 10270
+SHA256 (click-threading-0.5.0.tar.gz) =
rc/mI8AqWVwQfDFAcvZ6Inj+TrQLcsDRoskDzHivNDk=
+SIZE (click-threading-0.5.0.tar.gz) = 10484
diff 8cce3d79ca0b6037c03c0e9a0af53ee7aa3688ac /usr/ports
blob - e5430623e567218d357d8b1260f3a62602c9481f
file + productivity/vdirsyncer/Makefile
--- productivity/vdirsyncer/Makefile
+++ productivity/vdirsyncer/Makefile
@@ -2,9 +2,8 @@
COMMENT = synchronize calendars and contacts
-MODPY_EGG_VERSION = 0.16.8
+MODPY_EGG_VERSION = 0.18.0
DISTNAME = vdirsyncer-${MODPY_EGG_VERSION}
-REVISION = 5
CATEGORIES = productivity
@@ -34,8 +33,8 @@ RUN_DEPENDS = devel/py-atomicwrites${MODPY_FLAVOR} \
www/py-requests-toolbelt${MODPY_FLAVOR}
TEST_DEPENDS = devel/py-hypothesis${MODPY_FLAVOR} \
+ devel/py-test-cov${MODPY_FLAVOR} \
devel/py-test-localserver${MODPY_FLAVOR} \
- devel/py-test-subtesthack${MODPY_FLAVOR} \
www/py-urllib3${MODPY_FLAVOR}
TEST_ENV += DAV_SERVER=skip \
blob - 5aaad714c5f676b956f4e3f90c46a5f11b4fbc49
file + productivity/vdirsyncer/distinfo
--- productivity/vdirsyncer/distinfo
+++ productivity/vdirsyncer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vdirsyncer-0.16.8.tar.gz) =
v9tCL1Lh1NYL0GNdID+1n6f2Ezl9B5Zh60jnlGS6E8U=
-SIZE (vdirsyncer-0.16.8.tar.gz) = 115819
+SHA256 (vdirsyncer-0.18.0.tar.gz) =
J7w+1R93STX7ujkpFcjI1M9jmuUaRLZ0aGtJoQJfwgE=
+SIZE (vdirsyncer-0.18.0.tar.gz) = 115125
blob - afb9185e2c74cf6eb38b5da3164f62964edd96e9
file + /dev/null
--- productivity/vdirsyncer/patches/patch-setup_py
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1 2020/08/12 19:48:29 remi Exp $
-
-Compatibility with latest click
-https://github.com/pimutils/vdirsyncer/commit/3eb9ce5ae4320d52e6c876874511ff96a8a45f51
-
-Index: setup.py
---- setup.py.orig
-+++ setup.py
-@@ -11,7 +11,7 @@ from setuptools import Command, find_packages, setup
-
- requirements = [
- # https://github.com/mitsuhiko/click/issues/200
-- 'click>=5.0,<6.0',
-+ 'click>=5.0',
- 'click-log>=0.3.0, <0.4.0',
-
- # https://github.com/pimutils/vdirsyncer/issues/478
blob - c56889b13a0f461b967b753b055da6f7acbfc04e
file + /dev/null
--- productivity/vdirsyncer/patches/patch-tests_system_cli_test_sync_py
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD: patch-tests_system_cli_test_sync_py,v 1.1 2020/08/12 19:48:29 remi
Exp $
-
-Compatibility with latest click
-https://github.com/pimutils/vdirsyncer/commit/3eb9ce5ae4320d52e6c876874511ff96a8a45f51
-
-Index: tests/system/cli/test_sync.py
---- tests/system/cli/test_sync.py.orig
-+++ tests/system/cli/test_sync.py
-@@ -123,7 +123,10 @@ def test_verbosity(tmpdir, runner):
- runner.write_with_general('')
- result = runner.invoke(['--verbosity=HAHA', 'sync'])
- assert result.exception
-- assert 'invalid value for "--verbosity"' in result.output.lower()
-+ assert {
-+ 'invalid value for "--verbosity"' in result.output.lower()
-+ or "invalid value for '--verbosity'" in result.output.lower()
-+ }
-
-
- def test_collections_cache_invalidation(tmpdir, runner):
--
Paco Esteban.
0x5818130B8A6DBC03
