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

[Daniel M. Capella]

    Date: Monday, June 14, 2021 @ 01:54:17
  Author: polyzen
Revision: 963355

upgpkg: vdirsyncer 0.18.0-1

Call pytest directly to avoid coverage options enforced in setup.cfg:
https://github.com/pimutils/vdirsyncer/commit/47caebe843c9aa3a675f01ea53bbfac6bdebb034

Modified:
  vdirsyncer/trunk/PKGBUILD
Deleted:
  vdirsyncer/trunk/vdirsyncer-0.16.8-python-click.patch

--------------------------------------+
 PKGBUILD                             |   27 ++++++---------------------
 vdirsyncer-0.16.8-python-click.patch |   28 ----------------------------
 2 files changed, 6 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-14 01:43:24 UTC (rev 963354)
+++ PKGBUILD	2021-06-14 01:54:17 UTC (rev 963355)
@@ -3,8 +3,8 @@
 # Contributor: Hugo Osvaldo Barrera <hugo at barrera.io>
 
 pkgname=vdirsyncer
-pkgver=0.16.8
-pkgrel=7
+pkgver=0.18.0
+pkgrel=1
 pkgdesc="Synchronize CalDAV and CardDAV."
 arch=('any')
 url="https://vdirsyncer.pimutils.org/en/stable/"
@@ -17,26 +17,10 @@
             'python-django: Etesync support')
 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-deprecated_method.patch::https://github.com/pimutils/vdirsyncer/commit/7577fa21177442aacc2d86640ef28cebf1c4aaef.patch"
-        "${pkgname}-0.16.8-python-click.patch")
-sha512sums=('SKIP'
-            '904ff0d66ab00593c123713469e884faff238df626014e6a9fb77ea1d97cd3798b9e638991aaa78a45c16ea938ae8852c9c69381ac15e8b97752c9c19869dc3c'
-            'aa2b80f85b1122913f719c7d435d6c1ba7ac0d20adc925fa084c855bd0538069986342ba5de62755f1ea59af80f66e088d984e4545384ea034fb97c2c1e62e61')
+source=("git+https://github.com/pimutils/vdirsyncer.git#tag=${pkgver}?signed")
+sha512sums=('SKIP')
 validpgpkeys=('951082781CA308E4A529DEFD6F9FFF122B98C0CD') # Hugo Osvaldo Barrera <hugo at barrera.io>
 
-prepare() {
-  cd "${pkgname}"
-  # fix failing test
-  # https://github.com/pimutils/vdirsyncer/issues/828
-  # fix python-click version pinning
-  # https://github.com/pimutils/vdirsyncer/issues/831
-  patch -Np1 -i ../"${pkgname}-0.16.8-python-click.patch"
-  # update usage of deprecated method
-  # https://github.com/pimutils/vdirsyncer/issues/854
-  patch -Np1 -i ../"${pkgname}-0.16.8-deprecated_method.patch"
-}
-
 build() {
   cd "${pkgname}"
   python setup.py build
@@ -46,7 +30,8 @@
 
 check() {
   cd "${pkgname}"
-  make DETERMINISTIC_TESTS=true test || echo "Tests fail on python-pytest-subtesthack: https://github.com/pimutils/vdirsyncer/pull/851"
+  export DETERMINISTIC_TESTS=true
+  pytest --tb=short -c /dev/null
 }
 
 package() {

Deleted: vdirsyncer-0.16.8-python-click.patch
===================================================================
--- vdirsyncer-0.16.8-python-click.patch	2021-06-14 01:43:24 UTC (rev 963354)
+++ vdirsyncer-0.16.8-python-click.patch	2021-06-14 01:54:17 UTC (rev 963355)
@@ -1,28 +0,0 @@
-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):