Date: Tuesday, February 2, 2021 @ 04:20:55 Author: polyzen Revision: 840971
archrelease: copy trunk to community-any Added: vdirsyncer/repos/community-any/PKGBUILD (from rev 840970, vdirsyncer/trunk/PKGBUILD) vdirsyncer/repos/community-any/vdirsyncer-0.16.8-python-click.patch (from rev 840970, vdirsyncer/trunk/vdirsyncer-0.16.8-python-click.patch) vdirsyncer/repos/community-any/vdirsyncer.service (from rev 840970, vdirsyncer/trunk/vdirsyncer.service) vdirsyncer/repos/community-any/vdirsyncer.timer (from rev 840970, vdirsyncer/trunk/vdirsyncer.timer) Deleted: vdirsyncer/repos/community-any/PKGBUILD vdirsyncer/repos/community-any/vdirsyncer-0.16.8-python-click.patch vdirsyncer/repos/community-any/vdirsyncer.service vdirsyncer/repos/community-any/vdirsyncer.timer --------------------------------------+ PKGBUILD | 135 ++++++++++++++++----------------- vdirsyncer-0.16.8-python-click.patch | 56 ++++++------- vdirsyncer.service | 14 +-- vdirsyncer.timer | 20 ++-- 4 files changed, 112 insertions(+), 113 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-02-02 04:20:26 UTC (rev 840970) +++ PKGBUILD 2021-02-02 04:20:55 UTC (rev 840971) @@ -1,68 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> -# Contributor: Hugo Osvaldo Barrera <h...@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 <h...@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}" -} Copied: vdirsyncer/repos/community-any/PKGBUILD (from rev 840970, vdirsyncer/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-02-02 04:20:55 UTC (rev 840971) @@ -0,0 +1,67 @@ +# Maintainer: David Runge <dv...@archlinux.org> +# Contributor: Hugo Osvaldo Barrera <h...@barrera.io> + +pkgname=vdirsyncer +pkgver=0.16.8 +pkgrel=6 +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') +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 <h...@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 2021-02-02 04:20:26 UTC (rev 840970) +++ vdirsyncer-0.16.8-python-click.patch 2021-02-02 04:20:55 UTC (rev 840971) @@ -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-any/vdirsyncer-0.16.8-python-click.patch (from rev 840970, 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 2021-02-02 04:20:55 UTC (rev 840971) @@ -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 2021-02-02 04:20:26 UTC (rev 840970) +++ vdirsyncer.service 2021-02-02 04:20:55 UTC (rev 840971) @@ -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 840970, vdirsyncer/trunk/vdirsyncer.service) =================================================================== --- vdirsyncer.service (rev 0) +++ vdirsyncer.service 2021-02-02 04:20:55 UTC (rev 840971) @@ -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 2021-02-02 04:20:26 UTC (rev 840970) +++ vdirsyncer.timer 2021-02-02 04:20:55 UTC (rev 840971) @@ -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 840970, vdirsyncer/trunk/vdirsyncer.timer) =================================================================== --- vdirsyncer.timer (rev 0) +++ vdirsyncer.timer 2021-02-02 04:20:55 UTC (rev 840971) @@ -0,0 +1,10 @@ +[Unit] +Description=Synchronize vdirs + +[Timer] +OnBootSec=5m +OnUnitActiveSec=15m +AccuracySec=5m + +[Install] +WantedBy=timers.target