[arch-commits] Commit in vdirsyncer/trunk (3 files)

David Runge dvzrv at archlinux.org
Fri Jun 12 07:32:03 UTC 2020


    Date: Friday, June 12, 2020 @ 07:32:03
  Author: dvzrv
Revision: 642377

upgpkg: vdirsyncer 0.16.8-2: Removing python-click related version pinning (FS#66982).

Added:
  vdirsyncer/trunk/vdirsyncer-0.16.8-python-click.patch
    (from rev 642376, vdirsyncer/trunk/vdirsyncer-0.16.8-test_verbosity.patch)
Modified:
  vdirsyncer/trunk/PKGBUILD
Deleted:
  vdirsyncer/trunk/vdirsyncer-0.16.8-test_verbosity.patch

----------------------------------------+
 PKGBUILD                               |   10 ++++++----
 vdirsyncer-0.16.8-python-click.patch   |   28 ++++++++++++++++++++++++++++
 vdirsyncer-0.16.8-test_verbosity.patch |   13 -------------
 3 files changed, 34 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-12 07:16:50 UTC (rev 642376)
+++ PKGBUILD	2020-06-12 07:32:03 UTC (rev 642377)
@@ -3,7 +3,7 @@
 
 pkgname=vdirsyncer
 pkgver=0.16.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Synchronize CalDAV and CardDAV."
 arch=('any')
 url="https://vdirsyncer.pimutils.org/en/stable/"
@@ -18,9 +18,9 @@
 checkdepends=('python-hypothesis' 'python-pytest' 'python-pytest-localserver'
 'python-pytest-subtesthack')
 source=("git+https://github.com/pimutils/vdirsyncer.git#tag=${pkgver}?signed"
-        "${pkgname}-0.16.8-test_verbosity.patch")
+        "${pkgname}-0.16.8-python-click.patch")
 sha512sums=('SKIP'
-            '4c23669b161f4fa6f6db33648c5e47791ceaebd97e350a19ba0a1ac6eb3a4e1e753d6887bf22948d79c6e71e5685cab0d9a8a9fcb8e4b54445de2e378e01e251')
+            'aa2b80f85b1122913f719c7d435d6c1ba7ac0d20adc925fa084c855bd0538069986342ba5de62755f1ea59af80f66e088d984e4545384ea034fb97c2c1e62e61')
 validpgpkeys=('951082781CA308E4A529DEFD6F9FFF122B98C0CD') # Hugo Osvaldo Barrera <hugo at barrera.io>
 
 prepare() {
@@ -27,7 +27,9 @@
   cd "${pkgname}"
   # fix failing test
   # https://github.com/pimutils/vdirsyncer/issues/828
-  patch -Np1 -i ../"${pkgname}-0.16.8-test_verbosity.patch"
+  # fix python-click version pinning
+  # https://github.com/pimutils/vdirsyncer/issues/831
+  patch -Np1 -i ../"${pkgname}-0.16.8-python-click.patch"
 }
 
 build() {

Copied: vdirsyncer/trunk/vdirsyncer-0.16.8-python-click.patch (from rev 642376, vdirsyncer/trunk/vdirsyncer-0.16.8-test_verbosity.patch)
===================================================================
--- vdirsyncer-0.16.8-python-click.patch	                        (rev 0)
+++ vdirsyncer-0.16.8-python-click.patch	2020-06-12 07:32:03 UTC (rev 642377)
@@ -0,0 +1,28 @@
+diff --git i/setup.py w/setup.py
+index 653be04..aaa4c2d 100644
+--- i/setup.py
++++ w/setup.py
+@@ -11,8 +11,8 @@ from setuptools import Command, find_packages, setup
+ 
+ requirements = [
+     # https://github.com/mitsuhiko/click/issues/200
+-    'click>=5.0,<6.0',
+-    'click-log>=0.3.0, <0.4.0',
++    'click>=5.0',
++    'click-log>=0.3.0',
+ 
+     # https://github.com/pimutils/vdirsyncer/issues/478
+     'click-threading>=0.2',
+diff --git i/tests/system/cli/test_sync.py w/tests/system/cli/test_sync.py
+index 97e21e8..54fa201 100644
+--- i/tests/system/cli/test_sync.py
++++ w/tests/system/cli/test_sync.py
+@@ -123,7 +123,7 @@ 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()
+ 
+ 
+ def test_collections_cache_invalidation(tmpdir, runner):

Deleted: vdirsyncer-0.16.8-test_verbosity.patch
===================================================================
--- vdirsyncer-0.16.8-test_verbosity.patch	2020-06-12 07:16:50 UTC (rev 642376)
+++ vdirsyncer-0.16.8-test_verbosity.patch	2020-06-12 07:32:03 UTC (rev 642377)
@@ -1,13 +0,0 @@
-diff --git i/tests/system/cli/test_sync.py w/tests/system/cli/test_sync.py
-index 97e21e8..54fa201 100644
---- i/tests/system/cli/test_sync.py
-+++ w/tests/system/cli/test_sync.py
-@@ -123,7 +123,7 @@ 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()
- 
- 
- def test_collections_cache_invalidation(tmpdir, runner):



More information about the arch-commits mailing list