Accepting request 831282 from home:-miska-

-fix compatibility with latest click - patch taken directly from upstream git
 * 3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch

OBS-URL: https://build.opensuse.org/request/show/831282
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-vdirsyncer?expand=0&rev=28

3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch

@@ -0,0 +1,39 @@
+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
+--- a/setup.py
++++ b/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
+--- a/tests/system/cli/test_sync.py
++++ b/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):

python-vdirsyncer.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep  1 15:11:22 UTC 2020 - Michal Hrusecky <michal.hrusecky@opensuse.org>
+
+-fix compatibility with latest click - patch taken directly from upstream git
+ * 3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch 
+
 -------------------------------------------------------------------
 Thu Jul 23 09:16:29 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
 

python-vdirsyncer.spec

@@ -30,6 +30,8 @@ Source1:        vdirsyncer.service
 Source2:        vdirsyncer.timer
 # default deadline (200ms) is too short for obs
 Patch1:         python-vdirsyncer-shift-deadline.patch
+# Compatibility with latest click - taken directly from upstream git
+Patch2:         3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch
 BuildRequires:  %{python_module atomicwrites}
 BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  fdupes
@@ -73,6 +75,7 @@ what OfflineIMAP is for IMAP.
 %prep
 %setup -q -n vdirsyncer-%{version}
 %patch1 -p1
+%patch2 -p1
 rm -rf vdirsyncer.egg-info
 
 %build