Date: Wednesday, April 22, 2020 @ 15:05:10 Author: foxxx0 Revision: 617661
archrelease: copy trunk to community-any Added: python-cherrypy/repos/community-any/PKGBUILD (from rev 617660, python-cherrypy/trunk/PKGBUILD) python-cherrypy/repos/community-any/disable-broken-testCombinedTools.patch (from rev 617660, python-cherrypy/trunk/disable-broken-testCombinedTools.patch) python-cherrypy/repos/community-any/disable-sessiontest-file_concurrency.patch (from rev 617660, python-cherrypy/trunk/disable-sessiontest-file_concurrency.patch) Deleted: python-cherrypy/repos/community-any/PKGBUILD python-cherrypy/repos/community-any/disable-sessiontest-file_concurrency.patch --------------------------------------------+ PKGBUILD | 127 ++++++++++++++------------- disable-broken-testCombinedTools.patch | 13 ++ disable-sessiontest-file_concurrency.patch | 20 ++-- 3 files changed, 90 insertions(+), 70 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-04-22 15:05:05 UTC (rev 617660) +++ PKGBUILD 2020-04-22 15:05:10 UTC (rev 617661) @@ -1,60 +0,0 @@ -# Maintainer: Thore Bödecker <fox...@archlinux.org> -# Contributor: Laurent Soest <laurent.so...@gmail.com> -# Contributor: Angel Velasquez <an...@archlinux.org> -# Contributor: Kaiting Chen <kaitocr...@gmail.com> -# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> -# Contributor: Armando M. Baratti <amblis...@ajato.com.br> -# Contributor: Florian Richter <florian_rich...@gmx.de> - -pkgname='python-cherrypy' -_pkgname="${pkgname#python-}" -pkgver=18.5.0 -pkgrel=2 -pkgdesc='A pythonic, object-oriented web development framework' -arch=('any') -url='https://cherrypy.org' -license=('BSD') -depends=('python' 'python-six' 'python-cheroot' 'python-portend' 'python-jaraco' - 'python-more-itertools' 'python-zc.lockfile') -makedepends=('python-setuptools' 'python-setuptools-scm' 'python-six' - 'python-cheroot' 'python-portend' 'python-more-itertools' 'python-zc.lockfile') -checkdepends=('python-tox') -source=( - "${pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/v$pkgver.tar.gz" - 'disable-sessiontest-file_concurrency.patch' -) -sha512sums=('22b3ca20cc38bbbeb87facf139824b6dda0ef1fe26aaf5a829685a660e26a559b34e32a2f665b4c2221696b366e0b190e2f6218c5f6355269b076a6de84a5555' - 'e8abb7e3f8a064a0da529fcaf393dff305541bc273b539f3129b119d506be3be8cd67894dd4223e067b4dd8b55df8adc5d4feddb8d87188c9e528670c39e252f') - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - # apply patch from the source array (should be a pacman feature) - local filename - for filename in "${source[@]}"; do - if [[ "$filename" =~ \.patch$ ]]; then - msg2 "Applying patch ${filename##*/}" - patch -p1 -N -i "$srcdir/${filename##*/}" - fi - done -} - -build() { - # setuptools wont find version from git tag - export SETUPTOOLS_SCM_PRETEND_VERSION="${pkgver}" - cd "${srcdir}/${_pkgname}-${pkgver}" - python ./setup.py build -} - -check() { - cd "${srcdir}/${_pkgname}-${pkgver}" - tox -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - python ./setup.py install --root="${pkgdir}" --optimize=1 - - install -Dm644 LICENSE.md \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md" -} Copied: python-cherrypy/repos/community-any/PKGBUILD (from rev 617660, python-cherrypy/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-04-22 15:05:10 UTC (rev 617661) @@ -0,0 +1,67 @@ +# Maintainer: Thore Bödecker <fox...@archlinux.org> +# Contributor: Laurent Soest <laurent.so...@gmail.com> +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Kaiting Chen <kaitocr...@gmail.com> +# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> +# Contributor: Armando M. Baratti <amblis...@ajato.com.br> +# Contributor: Florian Richter <florian_rich...@gmx.de> + +pkgname='python-cherrypy' +_pkgname="${pkgname#python-}" +pkgver=18.6.0 +pkgrel=1 +pkgdesc='A pythonic, object-oriented web development framework' +arch=('any') +url='https://cherrypy.org' +license=('BSD') +depends=('python' 'python-six' 'python-cheroot' 'python-portend' 'python-jaraco' + 'python-more-itertools' 'python-zc.lockfile' 'python-tempora' 'python-pytz') +makedepends=('python-setuptools' 'python-setuptools-scm' 'python-six' 'python-jaraco' + 'python-cheroot' 'python-portend' 'python-more-itertools' 'python-zc.lockfile' + 'python-pytz' 'python-tempora') +checkdepends=('python-pytest' 'python-pytest-sugar' 'python-pytest-services' + 'python-objgraph' 'python-path' 'python-requests' 'python-zc.lockfile' + 'python-requests-toolbelt' 'python-coverage' 'python-webtest') +source=( + "${pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/v$pkgver.tar.gz" + 'disable-sessiontest-file_concurrency.patch' + 'disable-broken-testCombinedTools.patch' # https://github.com/cherrypy/cherrypy/issues/1849 +) +sha512sums=('d39e9529e4872437c6d94609561820f4946f00c8ded5aa857facbd2c48e0bafb5a4b70368ad72899dad12593a4f8ea86003c1da62c763d6de0181ef24573c465' + 'e8abb7e3f8a064a0da529fcaf393dff305541bc273b539f3129b119d506be3be8cd67894dd4223e067b4dd8b55df8adc5d4feddb8d87188c9e528670c39e252f' + '8160f7a0e43042c233af22712641724bbaff63d603b31eb3f058c810d2b8f1ca0f5a4666464e4492457bb665ebe0eb5da55bc7e8158e36968f5ccb08ad641733') + +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" + # apply patch from the source array (should be a pacman feature) + local filename + for filename in "${source[@]}"; do + if [[ "$filename" =~ \.patch$ ]]; then + msg2 "Applying patch ${filename##*/}" + patch -p1 -N -i "$srcdir/${filename##*/}" + fi + done +} + +build() { + # setuptools wont find version from git tag + export SETUPTOOLS_SCM_PRETEND_VERSION="${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" + python ./setup.py build +} + +check() { + cd "${srcdir}/${_pkgname}-${pkgver}" + export WEBTEST_INTERACTIVE=0 + rm -f ./{,cherrypy/}{pytest.ini,tox.ini} + py.test -vvv -s -ra --showlocals --noconftest cherrypy/test/ +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + python ./setup.py install --root="${pkgdir}" --optimize=1 + + install -Dm644 LICENSE.md \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md" +} Copied: python-cherrypy/repos/community-any/disable-broken-testCombinedTools.patch (from rev 617660, python-cherrypy/trunk/disable-broken-testCombinedTools.patch) =================================================================== --- disable-broken-testCombinedTools.patch (rev 0) +++ disable-broken-testCombinedTools.patch 2020-04-22 15:05:10 UTC (rev 617661) @@ -0,0 +1,13 @@ +diff -upr a/cherrypy/test/test_tools.py b/cherrypy/test/test_tools.py +--- a/cherrypy/test/test_tools.py 2020-04-17 19:49:39.000000000 +0200 ++++ b/cherrypy/test/test_tools.py 2020-04-22 17:01:08.273039145 +0200 +@@ -344,6 +344,9 @@ class ToolTests(helper.CPWebCase): + self.assertInBody(expected_msg) + + def testCombinedTools(self): ++ # https://github.com/cherrypy/cherrypy/issues/1849 ++ return self.skip() ++ + expectedResult = (ntou('Hello,world') + + europoundUnicode).encode('utf-8') + zbuf = io.BytesIO() Deleted: disable-sessiontest-file_concurrency.patch =================================================================== --- disable-sessiontest-file_concurrency.patch 2020-04-22 15:05:05 UTC (rev 617660) +++ disable-sessiontest-file_concurrency.patch 2020-04-22 15:05:10 UTC (rev 617661) @@ -1,10 +0,0 @@ ---- a/cherrypy/test/test_session.py 2018-12-09 17:55:39.000000000 +0100 -+++ b/cherrypy/test/test_session.py 2019-01-02 11:45:55.454146224 +0100 -@@ -238,6 +238,7 @@ class SessionTest(helper.CPWebCase): - - def test_2_File_Concurrency(self): - self.getPage('/set_session_cls/cherrypy.lib.sessions.FileSession') -+ pytest.skip('incosistent results (fails intermittently)') - self._test_Concurrency() - - def _test_Concurrency(self): Copied: python-cherrypy/repos/community-any/disable-sessiontest-file_concurrency.patch (from rev 617660, python-cherrypy/trunk/disable-sessiontest-file_concurrency.patch) =================================================================== --- disable-sessiontest-file_concurrency.patch (rev 0) +++ disable-sessiontest-file_concurrency.patch 2020-04-22 15:05:10 UTC (rev 617661) @@ -0,0 +1,10 @@ +--- a/cherrypy/test/test_session.py 2018-12-09 17:55:39.000000000 +0100 ++++ b/cherrypy/test/test_session.py 2019-01-02 11:45:55.454146224 +0100 +@@ -238,6 +238,7 @@ class SessionTest(helper.CPWebCase): + + def test_2_File_Concurrency(self): + self.getPage('/set_session_cls/cherrypy.lib.sessions.FileSession') ++ pytest.skip('incosistent results (fails intermittently)') + self._test_Concurrency() + + def _test_Concurrency(self):