Date: Monday, October 14, 2019 @ 12:21:43 Author: foxxx0 Revision: 515583
archrelease: copy trunk to community-any Added: python-cherrypy/repos/community-any/PKGBUILD (from rev 515582, python-cherrypy/trunk/PKGBUILD) python-cherrypy/repos/community-any/disable-broken-HTTP11-timeout-test.patch (from rev 515582, python-cherrypy/trunk/disable-broken-HTTP11-timeout-test.patch) python-cherrypy/repos/community-any/disable-sessiontest-file_concurrency.patch (from rev 515582, 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 python-cherrypy/repos/community-any/fix-nullbyte-test.patch --------------------------------------------+ PKGBUILD | 124 +++++++++++++-------------- disable-broken-HTTP11-timeout-test.patch | 57 ++++++++++++ disable-sessiontest-file_concurrency.patch | 20 ++-- fix-nullbyte-test.patch | 14 --- 4 files changed, 129 insertions(+), 86 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-10-14 12:21:38 UTC (rev 515582) +++ PKGBUILD 2019-10-14 12:21:43 UTC (rev 515583) @@ -1,62 +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.2.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') -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' - 'fix-nullbyte-test.patch' -) -sha512sums=('563aff736187e1b9db5775da501f2a205ce54b99ba479cc6d215c1430cea4b4211c76f9c361aeedb9f16b4e5b351d23dea423060515aa773c6437e485cc4807a' - 'e8abb7e3f8a064a0da529fcaf393dff305541bc273b539f3129b119d506be3be8cd67894dd4223e067b4dd8b55df8adc5d4feddb8d87188c9e528670c39e252f' - '99c77ca8108ba18fadd9106d8b1c9509730f85832d8da12bfaefa374444b400aab1e4c998f43c7e5501a2c5a6f29091c5975883f04f5b81188fc0ca6a8f214e7') - -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 515582, python-cherrypy/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-10-14 12:21:43 UTC (rev 515583) @@ -0,0 +1,62 @@ +# 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.3.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') +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' + 'disable-broken-HTTP11-timeout-test.patch' +) +sha512sums=('a16b8d4ce218191e5b5e7e31b886ab1d0a12eff2f7c9ef510680b1387b90db2113a20365228e1f09b0d8ded5488c567f32f9f79b8251a413b066884e6800c7a1' + 'e8abb7e3f8a064a0da529fcaf393dff305541bc273b539f3129b119d506be3be8cd67894dd4223e067b4dd8b55df8adc5d4feddb8d87188c9e528670c39e252f' + '7124af9cc5811a0b0cbe3225fa2e23977d196da1d36ad27025dec586a74fc10e8567f34e2ee4570cf1464f97f622ee66dc7012a89786f9e1de372353afba8138') + +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/disable-broken-HTTP11-timeout-test.patch (from rev 515582, python-cherrypy/trunk/disable-broken-HTTP11-timeout-test.patch) =================================================================== --- disable-broken-HTTP11-timeout-test.patch (rev 0) +++ disable-broken-HTTP11-timeout-test.patch 2019-10-14 12:21:43 UTC (rev 515583) @@ -0,0 +1,57 @@ +diff -upr a/cherrypy/test/test_conn.py b/cherrypy/test/test_conn.py +--- a/cherrypy/test/test_conn.py 2019-10-03 01:40:28.000000000 +0200 ++++ b/cherrypy/test/test_conn.py 2019-10-14 14:17:47.366772245 +0200 +@@ -379,23 +379,24 @@ class PipelineTests(helper.CPWebCase): + self.body = response.read() + self.assertBody(pov) + +- # Make another request on the same socket, +- # but timeout on the headers +- conn.send(b'GET /hello HTTP/1.1') +- # Wait for our socket timeout +- time.sleep(timeout * 2) +- response = conn.response_class(conn.sock, method='GET') +- try: +- response.begin() +- except Exception: +- if not isinstance(sys.exc_info()[1], +- (socket.error, BadStatusLine)): +- self.fail("Writing to timed out socket didn't fail" +- ' as it should have: %s' % sys.exc_info()[1]) +- else: +- self.fail("Writing to timed out socket didn't fail" +- ' as it should have: %s' % +- response.read()) ++ # BROKEN ++ # # Make another request on the same socket, ++ # # but timeout on the headers ++ # conn.send(b'GET /hello HTTP/1.1') ++ # # Wait for our socket timeout ++ # time.sleep(timeout * 2) ++ # response = conn.response_class(conn.sock, method='GET') ++ # try: ++ # response.begin() ++ # except Exception: ++ # if not isinstance(sys.exc_info()[1], ++ # (socket.error, BadStatusLine)): ++ # self.fail("Writing to timed out socket didn't fail" ++ # ' as it should have: %s' % sys.exc_info()[1]) ++ # else: ++ # self.fail("Writing to timed out socket didn't fail" ++ # ' as it should have: %s' % ++ # response.read()) + + conn.close() + +diff -upr a/pytest.ini b/pytest.ini +--- a/pytest.ini 2019-10-03 01:40:28.000000000 +0200 ++++ b/pytest.ini 2019-10-14 14:09:18.199109303 +0200 +@@ -3,6 +3,8 @@ norecursedirs = dist build .tox .eggs + addopts = --durations=10 -v -rxXs -l --junitxml=.test-results/pytest/results.xml --cov=cherrypy --cov-report term-missing:skip-covered --cov-report xml --doctest-modules + filterwarnings = + error ++ ignore:unclosed.*:ResourceWarning ++ ignore:The main thread is exiting, but the Bus is.*:RuntimeWarning + ignore:Use cheroot.test.webtest:DeprecationWarning + ignore:This method will be removed in future versions.*:DeprecationWarning + ignore:Unable to verify that the server is bound on:UserWarning Deleted: disable-sessiontest-file_concurrency.patch =================================================================== --- disable-sessiontest-file_concurrency.patch 2019-10-14 12:21:38 UTC (rev 515582) +++ disable-sessiontest-file_concurrency.patch 2019-10-14 12:21:43 UTC (rev 515583) @@ -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 515582, python-cherrypy/trunk/disable-sessiontest-file_concurrency.patch) =================================================================== --- disable-sessiontest-file_concurrency.patch (rev 0) +++ disable-sessiontest-file_concurrency.patch 2019-10-14 12:21:43 UTC (rev 515583) @@ -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): Deleted: fix-nullbyte-test.patch =================================================================== --- fix-nullbyte-test.patch 2019-10-14 12:21:38 UTC (rev 515582) +++ fix-nullbyte-test.patch 2019-10-14 12:21:43 UTC (rev 515583) @@ -1,14 +0,0 @@ ---- a/cherrypy/test/test_static.py -+++ b/cherrypy/test/test_static.py -@@ -398,8 +398,9 @@ class StaticTest(helper.CPWebCase): - self.assertInBody("I couldn't find that thing") - - def test_null_bytes(self): -- self.getPage('/static/\x00') -- self.assertStatus('404 Not Found') -+ import http.client -+ with pytest.raises(http.client.InvalidURL): -+ self.getPage('/static/\x00') - - @classmethod - def unicode_file(cls):