deskutils/py-vdirsyncer: Upate to 0.18.0

deskutils/py-vdirsyncer/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	vdirsyncer
-DISTVERSION=	0.16.8
-PORTREVISION=	1
+DISTVERSION=	0.18.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,10 +16,10 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${
 		${PYTHON_PKGNAMEPREFIX}click-log<0.4.0:devel/py-click-log@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click-threading>=0.2:devel/py-click-threading@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.4.1:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.4.0:www/py-requests-toolbelt@${PY_FLAVOR}
 
-USES=		python:3.5+
+USES=		python:3.7+
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 

deskutils/py-vdirsyncer/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1591914288
-SHA256 (vdirsyncer-0.16.8.tar.gz) = bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5
-SIZE (vdirsyncer-0.16.8.tar.gz) = 115819
+TIMESTAMP = 1634522611
+SHA256 (vdirsyncer-0.18.0.tar.gz) = 27bc3ed51f774935fbba392915c8c8d4cf639ae51a44b674686b49a1025fc201
+SIZE (vdirsyncer-0.18.0.tar.gz) = 115125

deskutils/py-vdirsyncer/files/patch-github_3eb9ce5.patch

@@ -1,39 +0,0 @@
-From 3eb9ce5ae4320d52e6c876874511ff96a8a45f51 Mon Sep 17 00:00:00 2001
-From: Hugo Osvaldo Barrera <hugo@barrera.io>
-Date: Tue, 9 Jun 2020 14:45:02 +0200
-Subject: [PATCH] Add compatibility with latest click
-
----
- setup.py                      | 2 +-
- tests/system/cli/test_sync.py | 5 ++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 59549f16..d584b95d 100644
---- setup.py
-+++ setup.py
-@@ -11,7 +11,7 @@
- 
- 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
-diff --git a/tests/system/cli/test_sync.py b/tests/system/cli/test_sync.py
-index f2423764..43d35dd8 100644
---- tests/system/cli/test_sync.py
-+++ 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):