Date: Tuesday, September 6, 2022 @ 22:15:51 Author: polyzen Revision: 1295769
archrelease: copy trunk to community-any Added: vdirsyncer/repos/community-any/PKGBUILD (from rev 1295751, vdirsyncer/trunk/PKGBUILD) vdirsyncer/repos/community-any/keys/ vdirsyncer/repos/community-any/vdirsyncer-0.18.0-remove_broken_fingerprint_test.patch (from rev 1295756, vdirsyncer/trunk/vdirsyncer-0.18.0-remove_broken_fingerprint_test.patch) vdirsyncer/repos/community-any/vdirsyncer.service (from rev 1295757, vdirsyncer/trunk/vdirsyncer.service) vdirsyncer/repos/community-any/vdirsyncer.timer (from rev 1295760, vdirsyncer/trunk/vdirsyncer.timer) Deleted: vdirsyncer/repos/community-any/PKGBUILD vdirsyncer/repos/community-any/vdirsyncer-0.18.0-remove_broken_fingerprint_test.patch vdirsyncer/repos/community-any/vdirsyncer.service vdirsyncer/repos/community-any/vdirsyncer.timer --------------------------------------------------------+ PKGBUILD | 124 +++++++-------- vdirsyncer-0.18.0-remove_broken_fingerprint_test.patch | 76 ++++----- vdirsyncer.service | 14 - vdirsyncer.timer | 20 +- 4 files changed, 120 insertions(+), 114 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-09-06 22:15:49 UTC (rev 1295768) +++ PKGBUILD 2022-09-06 22:15:51 UTC (rev 1295769) @@ -1,59 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> -# Maintainer: Daniel M. Capella <poly...@archlinux.org> -# Contributor: Hugo Osvaldo Barrera <h...@barrera.io> - -pkgname=vdirsyncer -pkgver=0.18.0 -pkgrel=3 -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) -checkdepends=(python-hypothesis python-pytest python-pytest-localserver -python-pytest-subtesthack) -optdepends=('python-requests-oauthlib: Google support' - 'python-etesync: Etesync support' - 'python-django: Etesync support') -source=( - "git+https://github.com/pimutils/vdirsyncer.git#tag=${pkgver}?signed" - "${pkgname}-0.18.0-remove_broken_fingerprint_test.patch" -) -sha512sums=('SKIP' - '91cdd6350771025478d44aa260b41357a8142d8bbbf7b63cd821b54d3645b7049a4d44ddb82de37425747c32dfa9a1d3b9ad08c77ec142b30a8281741e0c062d') -validpgpkeys=('951082781CA308E4A529DEFD6F9FFF122B98C0CD') # Hugo Osvaldo Barrera <h...@barrera.io> - -prepare() { - cd "${pkgname}" - # remove broken test. upstream will replace it with differing dependencies in an upcoming version - # https://github.com/pimutils/vdirsyncer/commit/1f6cc6f8beebd644d6570ce98fe56c33a8846daf - patch -Np1 -i ../"${pkgname}-0.18.0-remove_broken_fingerprint_test.patch" -} - -build() { - cd "${pkgname}" - python setup.py build - export PYTHONPATH="build:${PYTHONPATH}" - sphinx-build -b man docs/ build/ -} - -check() { - cd "${pkgname}" - export DETERMINISTIC_TESTS=true - pytest --tb=short -c /dev/null -} - -package() { - cd "${pkgname}" - python setup.py install --optimize=1 --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 1295751, vdirsyncer/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-09-06 22:15:51 UTC (rev 1295769) @@ -0,0 +1,65 @@ +# Maintainer: David Runge <dv...@archlinux.org> +# Maintainer: Daniel M. Capella <poly...@archlinux.org> +# Contributor: Hugo Osvaldo Barrera <h...@barrera.io> + +pkgname=vdirsyncer +pkgver=0.18.0 +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) +makedepends=(git python-build python-installer python-setuptools-scm + python-sphinx python-wheel) +checkdepends=(python-hypothesis python-pytest python-pytest-localserver +python-pytest-subtesthack) +optdepends=('python-requests-oauthlib: Google support' + 'python-etesync: Etesync support' + 'python-django: Etesync support') +source=( + "git+https://github.com/pimutils/vdirsyncer.git#tag=${pkgver}?signed" + "${pkgname}-0.18.0-remove_broken_fingerprint_test.patch" +) +sha512sums=('SKIP' + '91cdd6350771025478d44aa260b41357a8142d8bbbf7b63cd821b54d3645b7049a4d44ddb82de37425747c32dfa9a1d3b9ad08c77ec142b30a8281741e0c062d') +validpgpkeys=('951082781CA308E4A529DEFD6F9FFF122B98C0CD') # Hugo Osvaldo Barrera <h...@barrera.io> + +prepare() { + cd "${pkgname}" + # remove broken test. upstream will replace it with differing dependencies in an upcoming version + # https://github.com/pimutils/vdirsyncer/commit/1f6cc6f8beebd644d6570ce98fe56c33a8846daf + patch -Np1 -i ../"${pkgname}-0.18.0-remove_broken_fingerprint_test.patch" +} + +build() { + cd "${pkgname}" + export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver} + python -m build --wheel --skip-dependency-check --no-isolation + export PYTHONPATH="build:${PYTHONPATH}" + sphinx-build -b man docs/ build/ +} + +check() { + cd "${pkgname}" + export DETERMINISTIC_TESTS=true + pytest --tb=short -c /dev/null +} + +package() { + cd "${pkgname}" + python -m installer --destdir="${pkgdir}" dist/*.whl + # 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}" + + # symlink license file + local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") + install -d "${pkgdir}"/usr/share/licenses/${pkgname} + ln -s "${site_packages}"/${pkgname}-${pkgver}.dist-info/LICENSE \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} Deleted: vdirsyncer-0.18.0-remove_broken_fingerprint_test.patch =================================================================== --- vdirsyncer-0.18.0-remove_broken_fingerprint_test.patch 2022-09-06 22:15:49 UTC (rev 1295768) +++ vdirsyncer-0.18.0-remove_broken_fingerprint_test.patch 2022-09-06 22:15:51 UTC (rev 1295769) @@ -1,38 +0,0 @@ -diff --git i/tests/system/utils/test_main.py w/tests/system/utils/test_main.py -index 5a3942d..7121450 100644 ---- i/tests/system/utils/test_main.py -+++ w/tests/system/utils/test_main.py -@@ -38,33 +38,6 @@ def _fingerprints_broken(): - return broken_urllib3 - - --@pytest.mark.skipif( -- _fingerprints_broken(), reason="https://github.com/shazow/urllib3/issues/529" --) --@pytest.mark.parametrize( -- "fingerprint", -- [ -- "94:FD:7A:CB:50:75:A4:69:82:0A:F8:23:DF:07:FC:69:3E:CD:90:CA", -- "19:90:F7:23:94:F2:EF:AB:2B:64:2D:57:3D:25:95:2D", -- ], --) --def test_request_ssl_fingerprints(httpsserver, fingerprint): -- httpsserver.serve_content("") # we need to serve something -- -- http.request("GET", httpsserver.url, verify=False, verify_fingerprint=fingerprint) -- with pytest.raises(requests.exceptions.ConnectionError) as excinfo: -- http.request("GET", httpsserver.url, verify_fingerprint=fingerprint) -- -- with pytest.raises(requests.exceptions.ConnectionError) as excinfo: -- http.request( -- "GET", -- httpsserver.url, -- verify=False, -- verify_fingerprint="".join(reversed(fingerprint)), -- ) -- assert "Fingerprints did not match" in str(excinfo.value) -- -- - def test_open_graphical_browser(monkeypatch): - import webbrowser - Copied: vdirsyncer/repos/community-any/vdirsyncer-0.18.0-remove_broken_fingerprint_test.patch (from rev 1295756, vdirsyncer/trunk/vdirsyncer-0.18.0-remove_broken_fingerprint_test.patch) =================================================================== --- vdirsyncer-0.18.0-remove_broken_fingerprint_test.patch (rev 0) +++ vdirsyncer-0.18.0-remove_broken_fingerprint_test.patch 2022-09-06 22:15:51 UTC (rev 1295769) @@ -0,0 +1,38 @@ +diff --git i/tests/system/utils/test_main.py w/tests/system/utils/test_main.py +index 5a3942d..7121450 100644 +--- i/tests/system/utils/test_main.py ++++ w/tests/system/utils/test_main.py +@@ -38,33 +38,6 @@ def _fingerprints_broken(): + return broken_urllib3 + + +-@pytest.mark.skipif( +- _fingerprints_broken(), reason="https://github.com/shazow/urllib3/issues/529" +-) +-@pytest.mark.parametrize( +- "fingerprint", +- [ +- "94:FD:7A:CB:50:75:A4:69:82:0A:F8:23:DF:07:FC:69:3E:CD:90:CA", +- "19:90:F7:23:94:F2:EF:AB:2B:64:2D:57:3D:25:95:2D", +- ], +-) +-def test_request_ssl_fingerprints(httpsserver, fingerprint): +- httpsserver.serve_content("") # we need to serve something +- +- http.request("GET", httpsserver.url, verify=False, verify_fingerprint=fingerprint) +- with pytest.raises(requests.exceptions.ConnectionError) as excinfo: +- http.request("GET", httpsserver.url, verify_fingerprint=fingerprint) +- +- with pytest.raises(requests.exceptions.ConnectionError) as excinfo: +- http.request( +- "GET", +- httpsserver.url, +- verify=False, +- verify_fingerprint="".join(reversed(fingerprint)), +- ) +- assert "Fingerprints did not match" in str(excinfo.value) +- +- + def test_open_graphical_browser(monkeypatch): + import webbrowser + Deleted: vdirsyncer.service =================================================================== --- vdirsyncer.service 2022-09-06 22:15:49 UTC (rev 1295768) +++ vdirsyncer.service 2022-09-06 22:15:51 UTC (rev 1295769) @@ -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 1295757, vdirsyncer/trunk/vdirsyncer.service) =================================================================== --- vdirsyncer.service (rev 0) +++ vdirsyncer.service 2022-09-06 22:15:51 UTC (rev 1295769) @@ -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 2022-09-06 22:15:49 UTC (rev 1295768) +++ vdirsyncer.timer 2022-09-06 22:15:51 UTC (rev 1295769) @@ -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 1295760, vdirsyncer/trunk/vdirsyncer.timer) =================================================================== --- vdirsyncer.timer (rev 0) +++ vdirsyncer.timer 2022-09-06 22:15:51 UTC (rev 1295769) @@ -0,0 +1,10 @@ +[Unit] +Description=Synchronize vdirs + +[Timer] +OnBootSec=5m +OnUnitActiveSec=15m +AccuracySec=5m + +[Install] +WantedBy=timers.target