[arch-commits] Commit in python-cherrypy/repos/community-any (8 files)
David Runge
dvzrv at gemini.archlinux.org
Wed Jun 8 10:50:25 UTC 2022
Date: Wednesday, June 8, 2022 @ 10:50:24
Author: dvzrv
Revision: 1229230
archrelease: copy trunk to community-any
Added:
python-cherrypy/repos/community-any/PKGBUILD
(from rev 1229229, python-cherrypy/trunk/PKGBUILD)
python-cherrypy/repos/community-any/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch
(from rev 1229229, python-cherrypy/trunk/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch)
python-cherrypy/repos/community-any/disable-broken-testCombinedTools.patch
(from rev 1229229, python-cherrypy/trunk/disable-broken-testCombinedTools.patch)
python-cherrypy/repos/community-any/disable-sessiontest-file_concurrency.patch
(from rev 1229229, python-cherrypy/trunk/disable-sessiontest-file_concurrency.patch)
Deleted:
python-cherrypy/repos/community-any/PKGBUILD
python-cherrypy/repos/community-any/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch
python-cherrypy/repos/community-any/disable-broken-testCombinedTools.patch
python-cherrypy/repos/community-any/disable-sessiontest-file_concurrency.patch
----------------------------------------------------------------+
PKGBUILD | 155 +++++-----
disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch | 22 -
disable-broken-testCombinedTools.patch | 26 -
disable-sessiontest-file_concurrency.patch | 20 -
4 files changed, 119 insertions(+), 104 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-08 10:49:38 UTC (rev 1229229)
+++ PKGBUILD 2022-06-08 10:50:24 UTC (rev 1229230)
@@ -1,70 +0,0 @@
-# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
-# Contributor: Laurent Soest <laurent.soest at gmail.com>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy at gmail.com>
-# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
-# Contributor: Armando M. Baratti <amblistas at ajato.com.br>
-# Contributor: Florian Richter <Florian_Richter at gmx.de>
-
-pkgname='python-cherrypy'
-_pkgname="${pkgname#python-}"
-pkgver=18.6.1
-pkgrel=3
-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
- 'disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch' # https://github.com/cherrypy/cherrypy/issues/1873
-)
-sha512sums=('18b580d1bd896cd1bf44857ff3bd25cebb394389cf242e11024023f4646d2187b74a13bd2231eb6085a8d441ef6bf797739e570ec7636005b926e17f8e936094'
- 'e8abb7e3f8a064a0da529fcaf393dff305541bc273b539f3129b119d506be3be8cd67894dd4223e067b4dd8b55df8adc5d4feddb8d87188c9e528670c39e252f'
- '8160f7a0e43042c233af22712641724bbaff63d603b31eb3f058c810d2b8f1ca0f5a4666464e4492457bb665ebe0eb5da55bc7e8158e36968f5ccb08ad641733'
- '60ba651c113ecf32e865a40b9361dbe176200274f2b3f40f6d17cbea3d4a868dc2eaf6088906230417c423969ce9692c10ae1f2e0f045571e5c443b53d4e07ca')
-
-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
- echo "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/PKGBUILD (from rev 1229229, python-cherrypy/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-06-08 10:50:24 UTC (rev 1229230)
@@ -0,0 +1,85 @@
+# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
+# Contributor: Laurent Soest <laurent.soest at gmail.com>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy at gmail.com>
+# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+# Contributor: Armando M. Baratti <amblistas at ajato.com.br>
+# Contributor: Florian Richter <Florian_Richter at gmx.de>
+
+pkgname='python-cherrypy'
+_pkgname="${pkgname#python-}"
+pkgver=18.6.1
+pkgrel=4
+pkgdesc='A pythonic, object-oriented web development framework'
+arch=('any')
+url='https://cherrypy.org'
+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=('18b580d1bd896cd1bf44857ff3bd25cebb394389cf242e11024023f4646d2187b74a13bd2231eb6085a8d441ef6bf797739e570ec7636005b926e17f8e936094'
+ '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/"
+}
Deleted: disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch
===================================================================
--- disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch 2022-06-08 10:49:38 UTC (rev 1229229)
+++ disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch 2022-06-08 10:50:24 UTC (rev 1229230)
@@ -1,11 +0,0 @@
-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-any/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch (from rev 1229229, python-cherrypy/trunk/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch)
===================================================================
--- disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch (rev 0)
+++ disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch 2022-06-08 10:50:24 UTC (rev 1229230)
@@ -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()
Deleted: disable-broken-testCombinedTools.patch
===================================================================
--- disable-broken-testCombinedTools.patch 2022-06-08 10:49:38 UTC (rev 1229229)
+++ disable-broken-testCombinedTools.patch 2022-06-08 10:50:24 UTC (rev 1229230)
@@ -1,13 +0,0 @@
-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-any/disable-broken-testCombinedTools.patch (from rev 1229229, python-cherrypy/trunk/disable-broken-testCombinedTools.patch)
===================================================================
--- disable-broken-testCombinedTools.patch (rev 0)
+++ disable-broken-testCombinedTools.patch 2022-06-08 10:50:24 UTC (rev 1229230)
@@ -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 2022-06-08 10:49:38 UTC (rev 1229229)
+++ disable-sessiontest-file_concurrency.patch 2022-06-08 10:50:24 UTC (rev 1229230)
@@ -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 1229229, python-cherrypy/trunk/disable-sessiontest-file_concurrency.patch)
===================================================================
--- disable-sessiontest-file_concurrency.patch (rev 0)
+++ disable-sessiontest-file_concurrency.patch 2022-06-08 10:50:24 UTC (rev 1229230)
@@ -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):
More information about the arch-commits
mailing list