[arch-commits] Commit in vdirsyncer/repos/community-any (8 files)
David Runge
dvzrv at archlinux.org
Fri Jun 12 07:32:14 UTC 2020
Date: Friday, June 12, 2020 @ 07:32:14
Author: dvzrv
Revision: 642378
archrelease: copy trunk to community-any
Added:
vdirsyncer/repos/community-any/PKGBUILD
(from rev 642377, vdirsyncer/trunk/PKGBUILD)
vdirsyncer/repos/community-any/vdirsyncer-0.16.8-python-click.patch
(from rev 642377, vdirsyncer/trunk/vdirsyncer-0.16.8-python-click.patch)
vdirsyncer/repos/community-any/vdirsyncer.service
(from rev 642377, vdirsyncer/trunk/vdirsyncer.service)
vdirsyncer/repos/community-any/vdirsyncer.timer
(from rev 642377, vdirsyncer/trunk/vdirsyncer.timer)
Deleted:
vdirsyncer/repos/community-any/PKGBUILD
vdirsyncer/repos/community-any/vdirsyncer-0.16.8-test_verbosity.patch
vdirsyncer/repos/community-any/vdirsyncer.service
vdirsyncer/repos/community-any/vdirsyncer.timer
----------------------------------------+
PKGBUILD | 118 +++++++++++++++----------------
vdirsyncer-0.16.8-python-click.patch | 28 +++++++
vdirsyncer-0.16.8-test_verbosity.patch | 13 ---
vdirsyncer.service | 14 +--
vdirsyncer.timer | 20 ++---
5 files changed, 105 insertions(+), 88 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-12 07:32:03 UTC (rev 642377)
+++ PKGBUILD 2020-06-12 07:32:14 UTC (rev 642378)
@@ -1,58 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-# Contributor: Hugo Osvaldo Barrera <hugo at barrera.io>
-
-pkgname=vdirsyncer
-pkgver=0.16.8
-pkgrel=1
-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')
-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-test_verbosity.patch")
-sha512sums=('SKIP'
- '4c23669b161f4fa6f6db33648c5e47791ceaebd97e350a19ba0a1ac6eb3a4e1e753d6887bf22948d79c6e71e5685cab0d9a8a9fcb8e4b54445de2e378e01e251')
-validpgpkeys=('951082781CA308E4A529DEFD6F9FFF122B98C0CD') # Hugo Osvaldo Barrera <hugo at barrera.io>
-
-prepare() {
- 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}"
- python setup.py 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/"
- # docs
- install -vDm 644 {AUTHORS,CHANGELOG,README}.rst \
- -t "${pkgdir}/usr/share/doc/${pkgname}"
-}
-
Copied: vdirsyncer/repos/community-any/PKGBUILD (from rev 642377, vdirsyncer/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-12 07:32:14 UTC (rev 642378)
@@ -0,0 +1,60 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Hugo Osvaldo Barrera <hugo at barrera.io>
+
+pkgname=vdirsyncer
+pkgver=0.16.8
+pkgrel=2
+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')
+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
+}
+
+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/"
+ # docs
+ install -vDm 644 {AUTHORS,CHANGELOG,README}.rst \
+ -t "${pkgdir}/usr/share/doc/${pkgname}"
+}
+
Copied: vdirsyncer/repos/community-any/vdirsyncer-0.16.8-python-click.patch (from rev 642377, 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-06-12 07:32:14 UTC (rev 642378)
@@ -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:32:03 UTC (rev 642377)
+++ vdirsyncer-0.16.8-test_verbosity.patch 2020-06-12 07:32:14 UTC (rev 642378)
@@ -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):
Deleted: vdirsyncer.service
===================================================================
--- vdirsyncer.service 2020-06-12 07:32:03 UTC (rev 642377)
+++ vdirsyncer.service 2020-06-12 07:32:14 UTC (rev 642378)
@@ -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-any/vdirsyncer.service (from rev 642377, vdirsyncer/trunk/vdirsyncer.service)
===================================================================
--- vdirsyncer.service (rev 0)
+++ vdirsyncer.service 2020-06-12 07:32:14 UTC (rev 642378)
@@ -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-06-12 07:32:03 UTC (rev 642377)
+++ vdirsyncer.timer 2020-06-12 07:32:14 UTC (rev 642378)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Synchronize vdirs
-
-[Timer]
-OnBootSec=5m
-OnUnitActiveSec=15m
-AccuracySec=5m
-
-[Install]
-WantedBy=timers.target
Copied: vdirsyncer/repos/community-any/vdirsyncer.timer (from rev 642377, vdirsyncer/trunk/vdirsyncer.timer)
===================================================================
--- vdirsyncer.timer (rev 0)
+++ vdirsyncer.timer 2020-06-12 07:32:14 UTC (rev 642378)
@@ -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