Date: Monday, April 23, 2018 @ 21:59:34 Author: dvzrv Revision: 317464
upgpkg: radicale 2.1.9-1 Upgrading to 2.1.9. Removing - now unneeded - flake8 patch. Enabling check() again, as all tests run successfully. Modified: radicale/trunk/PKGBUILD Deleted: radicale/trunk/fix-flake8-test.diff ----------------------+ PKGBUILD | 23 ++++++++--------------- fix-flake8-test.diff | 24 ------------------------ 2 files changed, 8 insertions(+), 39 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-23 21:50:01 UTC (rev 317463) +++ PKGBUILD 2018-04-23 21:59:34 UTC (rev 317464) @@ -4,8 +4,8 @@ pkgname=radicale _name=Radicale -pkgver=2.1.8 -pkgrel=5 +pkgver=2.1.9 +pkgrel=1 pkgdesc='Simple calendar (CalDAV) and contact (CardDAV) server' arch=('any') url="http://www.radicale.org/" @@ -14,12 +14,10 @@ checkdepends=('python-bcrypt' 'python-pytest-cov' 'python-pytest-flake8' 'python-pytest-isort' 'python-pytest-runner') backup=('etc/radicale/config') source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Kozea/${pkgname}/archive/${pkgver}.tar.gz" - 'fix-flake8-test.diff' "${pkgname}-sysusers.conf" "${pkgname}-tmpfiles.conf" "${pkgname}.service") -sha512sums=('70d7c890a733fb27d007fa593d0140bfd3bde1ff46235252a2cdd3ceaf3bc9f998acb62e131f9bc71aa1c55f51c297e4f494cb22f8cba3c5d8d90069e4957c87' - 'f951fff9187448ea3052395b6999f19cfc48dbf5cfb24359f646e1fba8a3556b40c7174f91deee4a18f5794c5fd8e45ee555a569e4320d758712ee581df6feb1' +sha512sums=('30df36772f4dd38c9c79ecd9669da8b40c7284afa9e2949c174c159838c33a66edec1a49adf7c110017dc83c592415be6fa43e2de6007d7e154b8707773c4a44' '444489ba929680490884e338acc311fb61d81f9d9f0282c92c40a80317af9e61123e4764e803d1698876417170efd40bfe7f56408570891c4e426de3be17c302' '4570ed393b73bc5a3fd571947acae78b96b5e17f659e3169f542b9c481635680c724d5c6c0952661fae063caf04c786afe7043c5052945e7a00bb66326dec016' '6a3452009bebc0f8680ea8e64b9a398c04f3fb6b20752c377392e22641845a04dbfda78d586271c9a25bd7d5ba42b7a8f74774afed68732f19ddd764f53e11cc') @@ -26,10 +24,6 @@ prepare() { mv -v ${_name}-${pkgver} ${pkgname}-${pkgver} - cd "${pkgname}-${pkgver}" - # issue with implicit exception handling: - # https://github.com/Kozea/Radicale/issues/780 - patch -Np1 -i "${srcdir}/fix-flake8-test.diff" } build() { @@ -37,11 +31,10 @@ python setup.py build } -# disabling checks because of broken python-pycodestyle -#check() { -# cd "${pkgname}-${pkgver}" -# python setup.py test -#} +check() { + cd "${pkgname}-${pkgver}" + python setup.py test +} package() { cd "${pkgname}-${pkgver}" @@ -65,6 +58,6 @@ install -vDm 644 "${srcdir}/${pkgname}-tmpfiles.conf" \ "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" # docs - install -t "${pkgdir}/usr/share/doc/${pkgname}/" -vDm644 {NEWS,README}.md + install -t "${pkgdir}/usr/share/doc/${pkgname}/" -vDm 644 {NEWS,README}.md } Deleted: fix-flake8-test.diff =================================================================== --- fix-flake8-test.diff 2018-04-23 21:50:01 UTC (rev 317463) +++ fix-flake8-test.diff 2018-04-23 21:59:34 UTC (rev 317464) @@ -1,24 +0,0 @@ -diff -ruN Radicale-2.1.8-a/radicale/__init__.py Radicale-2.1.8-b/radicale/__init__.py ---- Radicale-2.1.8-a/radicale/__init__.py 2017-09-24 02:01:14.000000000 +0200 -+++ Radicale-2.1.8-b/radicale/__init__.py 2018-02-04 14:08:39.257626655 +0100 -@@ -120,7 +120,7 @@ - try: - self.server_bind() - self.server_activate() -- except: -+ except Exception: - self.server_close() - raise - -diff -ruN Radicale-2.1.8-a/radicale/storage.py Radicale-2.1.8-b/radicale/storage.py ---- Radicale-2.1.8-a/radicale/storage.py 2017-09-24 02:01:14.000000000 +0200 -+++ Radicale-2.1.8-b/radicale/storage.py 2018-02-04 14:09:06.850699075 +0100 -@@ -779,7 +779,7 @@ - (path, e)) from e - tmp.close() - os.replace(tmp.name, path) -- except: -+ except Exception: - tmp.close() - os.remove(tmp.name) - raise