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

[David Runge]

    Date: Thursday, June 11, 2020 @ 17:38:56
  Author: dvzrv
Revision: 642063

upgpkg: vdirsyncer 0.16.8-1: Upgrading to 0.16.8.

Switching to PGP signature validation.
Removing systemd units from source array (they are now being cloned directly).
Fixing a python-click related problem with the tests.

Added:
  vdirsyncer/trunk/vdirsyncer-0.16.8-test_verbosity.patch
Modified:
  vdirsyncer/trunk/PKGBUILD

----------------------------------------+
 PKGBUILD                               |   52 +++++++++++++++----------------
 vdirsyncer-0.16.8-test_verbosity.patch |   13 +++++++
 2 files changed, 39 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-11 16:35:28 UTC (rev 642062)
+++ PKGBUILD	2020-06-11 17:38:56 UTC (rev 642063)
@@ -1,47 +1,47 @@
-# Maintainer: David Runge <dave at sleepmap.de>
+# Maintainer: David Runge <dvzrv at archlinux.org>
 # Contributor: Hugo Osvaldo Barrera <hugo at barrera.io>
 
 pkgname=vdirsyncer
-pkgver=0.16.7
-pkgrel=3
+pkgver=0.16.8
+pkgrel=1
 pkgdesc="Synchronize CalDAV and CardDAV."
 arch=('any')
 url="https://vdirsyncer.pimutils.org/en/stable/"
 license=('BSD')
-depends=('python-click' 'python-setuptools' 'python-requests-toolbelt'
-'python-atomicwrites' 'python-click-threading' 'python-click-log')
-makedepends=('python-setuptools-scm')
+depends=('python-atomicwrites' 'python-click' 'python-click-log'
+'python-click-threading' 'python-requests' 'python-requests-toolbelt'
+'python-setuptools')
+makedepends=('git' 'python-setuptools-scm')
 optdepends=('python-requests-oauthlib: Google support'
-            'python-etesync: Etesync support')
-checkdepends=('python-pytest' 'python-wsgi-intercept' 'radicale'
-'python-pytest-xprocess' 'python-pytest-localserver' 'python-hypothesis'
+            'python-etesync: Etesync support'
+            'python-django: Etesync support')
+checkdepends=('python-hypothesis' 'python-pytest' 'python-pytest-localserver'
 'python-pytest-subtesthack')
-source=("${pkgname}-${pkgver}.tar.gz::https://pypi.io/packages/source/v/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "https://raw.githubusercontent.com/pimutils/${pkgname}/${pkgver}/contrib/${pkgname}.service"
-        "https://raw.githubusercontent.com/pimutils/${pkgname}/${pkgver}/contrib/${pkgname}.timer")
-sha512sums=('218c6781139a9e979077308dc732756cc27ecb67966e4b52be31cb1ebf04d224443036102d5c4bad253b9dcf533939f0b72082166f0fe94e042a7e946b8fad0e'
-            'f0d1f9755b21358b0371d94cb0d2f1fc12b8dc095d2536c7fc9025906d666ec33b85b3a3924b16a3311dc81e136e0790d50f84c7c8f9f65aaed80613fa69d066'
-            'ac2656edc5ad39dbdc31a71117d98bfdc4ab5001729fc6a76f54e1e34ff81192f29e6162b2f8e429a5e02b8842fe1f2f51b00e84637eda53ba1448b8f08c6b80')
+source=("git+https://github.com/pimutils/vdirsyncer.git#tag=${pkgver}?signed"
+        "${pkgname}-0.16.8-test_verbosity.patch")
+sha512sums=('SKIP'
+            '4c23669b161f4fa6f6db33648c5e47791ceaebd97e350a19ba0a1ac6eb3a4e1e753d6887bf22948d79c6e71e5685cab0d9a8a9fcb8e4b54445de2e378e01e251')
+validpgpkeys=('951082781CA308E4A529DEFD6F9FFF122B98C0CD') # Hugo Osvaldo Barrera <hugo at barrera.io>
 
 prepare() {
-  cd "${pkgname}-${pkgver}"
-  # removing obsoleted use of health_check in hypothesis
-  sed -e '/_health_/d' \
-      -i tests/{unit/test_repair,conftest}.py
+  cd "${pkgname}"
+  # fix failing test
+  # https://github.com/pimutils/vdirsyncer/issues/828
+  patch -Np1 -i ../"${pkgname}-0.16.8-test_verbosity.patch"
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}"
   python setup.py build
 }
 
 check() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}"
   make DETERMINISTIC_TESTS=true test
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}"
   python setup.py install --skip-build \
     --optimize=1 \
     --prefix=/usr \
@@ -49,10 +49,10 @@
   # license
   install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
   # systemd
-  install -t "${pkgdir}/usr/lib/systemd/user/" \
-    -vDm 644 "${srcdir}/${pkgname}."{service,timer}
+  install -vDm 644 "contrib/${pkgname}."{service,timer} \
+    -t "${pkgdir}/usr/lib/systemd/user/"
   # docs
-  install -t "${pkgdir}/usr/share/doc/${pkgname}" \
-    -vDm 644 {AUTHORS,CHANGELOG,README}.rst
+  install -vDm 644 {AUTHORS,CHANGELOG,README}.rst \
+    -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
 

Added: vdirsyncer-0.16.8-test_verbosity.patch
===================================================================
--- vdirsyncer-0.16.8-test_verbosity.patch	                        (rev 0)
+++ vdirsyncer-0.16.8-test_verbosity.patch	2020-06-11 17:38:56 UTC (rev 642063)
@@ -0,0 +1,13 @@
+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):