mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 13:50:38 -04:00
3aab7a6b1b
- vdirsyncer was failing at runtime due to requering a outdated py-click version. PR: 247191 Reported by: Simeon Simeonov <sgs@pichove.org>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
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):
|