Date: Thursday, April 6, 2023 @ 03:27:21
Author: felixonmars
Revision: 1438238
archrelease: copy trunk to community-staging-any
Added:
python-cherrypy/repos/community-staging-any/
python-cherrypy/repos/community-staging-any/PKGBUILD
(from rev 1438237, python-cherrypy/trunk/PKGBUILD)
python-cherrypy/repos/community-staging-any/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch
(from rev 1438237,
python-cherrypy/trunk/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch)
python-cherrypy/repos/community-staging-any/disable-broken-testCombinedTools.patch
(from rev 1438237,
python-cherrypy/trunk/disable-broken-testCombinedTools.patch)
python-cherrypy/repos/community-staging-any/disable-sessiontest-file_concurrency.patch
(from rev 1438237,
python-cherrypy/trunk/disable-sessiontest-file_concurrency.patch)
----------------------------------------------------------------+
PKGBUILD | 85
++++++++++
disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch | 11 +
disable-broken-testCombinedTools.patch | 13 +
disable-sessiontest-file_concurrency.patch | 10 +
4 files changed, 119 insertions(+)
Copied: python-cherrypy/repos/community-staging-any/PKGBUILD (from rev 1438237,
python-cherrypy/trunk/PKGBUILD)
===================================================================
--- community-staging-any/PKGBUILD (rev 0)
+++ community-staging-any/PKGBUILD 2023-04-06 03:27:21 UTC (rev 1438238)
@@ -0,0 +1,85 @@
+# Maintainer: Thore Bödecker <[email protected]>
+# Contributor: Laurent Soest <[email protected]>
+# Contributor: Angel Velasquez <[email protected]>
+# Contributor: Kaiting Chen <[email protected]>
+# Contributor: Douglas Soares de Andrade <[email protected]>
+# Contributor: Armando M. Baratti <[email protected]>
+# Contributor: Florian Richter <[email protected]>
+
+pkgname='python-cherrypy'
+_pkgname="${pkgname#python-}"
+pkgver=18.8.0
+pkgrel=3
+pkgdesc='A pythonic, object-oriented web development framework'
+arch=('any')
+url='https://cherrypy.dev'
+license=('BSD')
+depends=('python' 'python-cheroot' 'python-portend' 'python-jaraco.collections'
+'python-more-itertools' 'python-zc.lockfile')
+makedepends=('python-build' 'python-installer' 'python-setuptools'
'python-setuptools-scm' 'python-wheel')
+checkdepends=('python-objgraph' 'python-path' 'python-pytest'
+'python-pytest-forked' 'python-pytest-services' 'python-pytest-sugar'
+'python-requests-toolbelt')
+optdepends=(
+ 'python-flup: for xcgi support'
+ 'python-memcached: for memcached session support'
+ 'python-pyopenssl: for TLS support'
+ 'python-routes: for routes_dispatcher support'
+ 'python-simplejson: for JSON support'
+)
+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
+ 'disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch' #
https://github.com/cherrypy/cherrypy/issues/1873
+)
+sha512sums=('54e815d91bacc9710cc2962be2640d7e74b872fb69ab235b217481425fa6fa854d4997ec67ca6e4d3f8f70a995b93c532b909a3feffbfdb149f850a4fa047fad'
+
'e8abb7e3f8a064a0da529fcaf393dff305541bc273b539f3129b119d506be3be8cd67894dd4223e067b4dd8b55df8adc5d4feddb8d87188c9e528670c39e252f'
+
'8160f7a0e43042c233af22712641724bbaff63d603b31eb3f058c810d2b8f1ca0f5a4666464e4492457bb665ebe0eb5da55bc7e8158e36968f5ccb08ad641733'
+
'60ba651c113ecf32e865a40b9361dbe176200274f2b3f40f6d17cbea3d4a868dc2eaf6088906230417c423969ce9692c10ae1f2e0f045571e5c443b53d4e07ca')
+
+prepare() {
+ cd ${_pkgname}-${pkgver}
+ # apply patch from the source array (should be a pacman feature)
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ echo "Applying patch ${filename##*/}"
+ patch -p1 -N -i "$srcdir/${filename##*/}"
+ fi
+ done
+ # we are not interested in coverage tests
+ sed -e '/cov/d' -i pytest.ini
+}
+
+build() {
+ # setuptools wont find version from git tag
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${pkgver}"
+
+ cd ${_pkgname}-${pkgver}
+ python -m build --wheel --no-isolation
+}
+
+check() {
+ cd ${_pkgname}-${pkgver}
+ # disable tests that fail due to escalated DeprecationWarnings due to calls
to StringIO.readfp()
+ # TODO: report upstream!
+ pytest -vv \
+ -k "not testConfig \
+ and not testCustomNamespaces \
+ and not testHandlerToolConfigOverride \
+ and not testHandlerToolConfigOverride \
+ and not testRespNamespaces \
+ and not testUnrepr \
+ and not test_request_body_namespace \
+ and not test_gc \
+ and not test_config \
+ and not test_call_with_kwargs \
+ and not test_call_with_literal_dict"
+}
+
+package() {
+ cd ${_pkgname}-${pkgver}
+ python -m installer --destdir="$pkgdir" dist/*.whl
+ install -vDm 644 LICENSE.md -t "$pkgdir/usr/share/licenses/$pkgname/"
+}
Copied:
python-cherrypy/repos/community-staging-any/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch
(from rev 1438237,
python-cherrypy/trunk/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch)
===================================================================
---
community-staging-any/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch
(rev 0)
+++
community-staging-any/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch
2023-04-06 03:27:21 UTC (rev 1438238)
@@ -0,0 +1,11 @@
+diff -upr a/cherrypy/test/test_states.py b/cherrypy/test/test_states.py
+--- a/cherrypy/test/test_states.py 2020-04-17 19:49:39.000000000 +0200
++++ b/cherrypy/test/test_states.py 2020-11-16 10:53:32.382567506 +0100
+@@ -162,6 +162,7 @@ class ServerStateTests(helper.CPWebCase)
+ self.assertEqual(len(db_connection.threads), 0)
+
+ def test_2_KeyboardInterrupt(self):
++ pytest.skip('broken, see
https://github.com/cherrypy/cherrypy/issues/1873')
+ # Raise a keyboard interrupt in the HTTP server's main thread.
+ # We must start the server in this, the main thread
+ engine.start()
Copied:
python-cherrypy/repos/community-staging-any/disable-broken-testCombinedTools.patch
(from rev 1438237,
python-cherrypy/trunk/disable-broken-testCombinedTools.patch)
===================================================================
--- community-staging-any/disable-broken-testCombinedTools.patch
(rev 0)
+++ community-staging-any/disable-broken-testCombinedTools.patch
2023-04-06 03:27:21 UTC (rev 1438238)
@@ -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()
Copied:
python-cherrypy/repos/community-staging-any/disable-sessiontest-file_concurrency.patch
(from rev 1438237,
python-cherrypy/trunk/disable-sessiontest-file_concurrency.patch)
===================================================================
--- community-staging-any/disable-sessiontest-file_concurrency.patch
(rev 0)
+++ community-staging-any/disable-sessiontest-file_concurrency.patch
2023-04-06 03:27:21 UTC (rev 1438238)
@@ -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):