[arch-commits] Commit in vdirsyncer/repos/community-staging-any (8 files)

Felix Yan felixonmars at archlinux.org
Fri Nov 13 21:41:12 UTC 2020


    Date: Friday, November 13, 2020 @ 21:41:11
  Author: felixonmars
Revision: 754025

archrelease: copy trunk to community-staging-any

Added:
  vdirsyncer/repos/community-staging-any/PKGBUILD
    (from rev 754024, vdirsyncer/trunk/PKGBUILD)
  vdirsyncer/repos/community-staging-any/vdirsyncer-0.16.8-python-click.patch
    (from rev 754024, vdirsyncer/trunk/vdirsyncer-0.16.8-python-click.patch)
  vdirsyncer/repos/community-staging-any/vdirsyncer.service
    (from rev 754024, vdirsyncer/trunk/vdirsyncer.service)
  vdirsyncer/repos/community-staging-any/vdirsyncer.timer
    (from rev 754024, vdirsyncer/trunk/vdirsyncer.timer)
Deleted:
  vdirsyncer/repos/community-staging-any/PKGBUILD
  vdirsyncer/repos/community-staging-any/vdirsyncer-0.16.8-python-click.patch
  vdirsyncer/repos/community-staging-any/vdirsyncer.service
  vdirsyncer/repos/community-staging-any/vdirsyncer.timer

--------------------------------------+
 PKGBUILD                             |  131 +++++++++++++++++----------------
 vdirsyncer-0.16.8-python-click.patch |   56 +++++++-------
 vdirsyncer.service                   |   14 +--
 vdirsyncer.timer                     |   20 ++---
 4 files changed, 113 insertions(+), 108 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-13 21:40:56 UTC (rev 754024)
+++ PKGBUILD	2020-11-13 21:41:11 UTC (rev 754025)
@@ -1,63 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-# Contributor: Hugo Osvaldo Barrera <hugo at barrera.io>
-
-pkgname=vdirsyncer
-pkgver=0.16.8
-pkgrel=4
-pkgdesc="Synchronize CalDAV and CardDAV."
-arch=('any')
-url="https://vdirsyncer.pimutils.org/en/stable/"
-license=('BSD')
-depends=('python-atomicwrites' 'python-click' 'python-click-log'
-'python-click-threading' 'python-requests' 'python-requests-toolbelt'
-'python-setuptools')
-makedepends=('git' 'python-setuptools-scm' 'python-sphinx')
-optdepends=('python-requests-oauthlib: Google support'
-            'python-etesync: Etesync support'
-            '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-python-click.patch")
-sha512sums=('SKIP'
-            'aa2b80f85b1122913f719c7d435d6c1ba7ac0d20adc925fa084c855bd0538069986342ba5de62755f1ea59af80f66e088d984e4545384ea034fb97c2c1e62e61')
-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"
-}
-
-build() {
-  cd "${pkgname}"
-  python setup.py build
-  export PYTHONPATH="build:${PYTHONPATH}"
-  sphinx-build -b man docs/ build/
-}
-
-check() {
-  cd "${pkgname}"
-  make DETERMINISTIC_TESTS=true test
-}
-
-package() {
-  cd "${pkgname}"
-  python setup.py install --skip-build \
-    --optimize=1 \
-    --prefix=/usr \
-    --root="${pkgdir}"
-  # license
-  install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
-  # systemd
-  install -vDm 644 "contrib/${pkgname}."{service,timer} \
-    -t "${pkgdir}/usr/lib/systemd/user/"
-  # man page
-  install -vDm 644 "build/${pkgname}.1" -t "${pkgdir}/usr/share/man/man1"
-  # docs
-  install -vDm 644 {AUTHORS,CHANGELOG,README}.rst \
-    -t "${pkgdir}/usr/share/doc/${pkgname}"
-}

Copied: vdirsyncer/repos/community-staging-any/PKGBUILD (from rev 754024, vdirsyncer/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-13 21:41:11 UTC (rev 754025)
@@ -0,0 +1,68 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Hugo Osvaldo Barrera <hugo at barrera.io>
+
+pkgname=vdirsyncer
+pkgver=0.16.8
+pkgrel=5
+pkgdesc="Synchronize CalDAV and CardDAV."
+arch=('any')
+url="https://vdirsyncer.pimutils.org/en/stable/"
+license=('BSD')
+depends=('python-atomicwrites' 'python-click' 'python-click-log'
+'python-click-threading' 'python-requests' 'python-requests-toolbelt'
+'python-setuptools')
+makedepends=('git' 'python-setuptools-scm' 'python-sphinx')
+optdepends=('python-requests-oauthlib: Google support'
+            'python-etesync: Etesync support'
+            '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')
+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
+  export PYTHONPATH="build:${PYTHONPATH}"
+  sphinx-build -b man docs/ build/
+}
+
+check() {
+  cd "${pkgname}"
+  make DETERMINISTIC_TESTS=true test || echo "Tests fail on python-pytest-subtesthack: https://github.com/pimutils/vdirsyncer/pull/851"
+}
+
+package() {
+  cd "${pkgname}"
+  python setup.py install --skip-build \
+    --optimize=1 \
+    --prefix=/usr \
+    --root="${pkgdir}"
+  # license
+  install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+  # systemd
+  install -vDm 644 "contrib/${pkgname}."{service,timer} \
+    -t "${pkgdir}/usr/lib/systemd/user/"
+  # man page
+  install -vDm 644 "build/${pkgname}.1" -t "${pkgdir}/usr/share/man/man1"
+  # docs
+  install -vDm 644 {AUTHORS,CHANGELOG,README}.rst \
+    -t "${pkgdir}/usr/share/doc/${pkgname}"
+}

Deleted: vdirsyncer-0.16.8-python-click.patch
===================================================================
--- vdirsyncer-0.16.8-python-click.patch	2020-11-13 21:40:56 UTC (rev 754024)
+++ vdirsyncer-0.16.8-python-click.patch	2020-11-13 21:41:11 UTC (rev 754025)
@@ -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):

Copied: vdirsyncer/repos/community-staging-any/vdirsyncer-0.16.8-python-click.patch (from rev 754024, vdirsyncer/trunk/vdirsyncer-0.16.8-python-click.patch)
===================================================================
--- vdirsyncer-0.16.8-python-click.patch	                        (rev 0)
+++ vdirsyncer-0.16.8-python-click.patch	2020-11-13 21:41:11 UTC (rev 754025)
@@ -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.service
===================================================================
--- vdirsyncer.service	2020-11-13 21:40:56 UTC (rev 754024)
+++ vdirsyncer.service	2020-11-13 21:41:11 UTC (rev 754025)
@@ -1,7 +0,0 @@
-[Unit]
-Description=Synchronize calendars and contacts
-Documentation=https://vdirsyncer.readthedocs.org/
-
-[Service]
-ExecStart=/usr/bin/vdirsyncer sync
-Type=oneshot

Copied: vdirsyncer/repos/community-staging-any/vdirsyncer.service (from rev 754024, vdirsyncer/trunk/vdirsyncer.service)
===================================================================
--- vdirsyncer.service	                        (rev 0)
+++ vdirsyncer.service	2020-11-13 21:41:11 UTC (rev 754025)
@@ -0,0 +1,7 @@
+[Unit]
+Description=Synchronize calendars and contacts
+Documentation=https://vdirsyncer.readthedocs.org/
+
+[Service]
+ExecStart=/usr/bin/vdirsyncer sync
+Type=oneshot

Deleted: vdirsyncer.timer
===================================================================
--- vdirsyncer.timer	2020-11-13 21:40:56 UTC (rev 754024)
+++ vdirsyncer.timer	2020-11-13 21:41:11 UTC (rev 754025)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Synchronize vdirs
-
-[Timer]
-OnBootSec=5m
-OnUnitActiveSec=15m
-AccuracySec=5m
-
-[Install]
-WantedBy=timers.target

Copied: vdirsyncer/repos/community-staging-any/vdirsyncer.timer (from rev 754024, vdirsyncer/trunk/vdirsyncer.timer)
===================================================================
--- vdirsyncer.timer	                        (rev 0)
+++ vdirsyncer.timer	2020-11-13 21:41:11 UTC (rev 754025)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Synchronize vdirs
+
+[Timer]
+OnBootSec=5m
+OnUnitActiveSec=15m
+AccuracySec=5m
+
+[Install]
+WantedBy=timers.target



More information about the arch-commits mailing list