[arch-commits] Commit in python-cherrypy/repos (5 files)

Evangelos Foutras foutrelis at gemini.archlinux.org
Wed Dec 1 11:36:21 UTC 2021


    Date: Wednesday, December 1, 2021 @ 11:36:21
  Author: foutrelis
Revision: 1059221

archrelease: copy trunk to community-staging-any

Added:
  python-cherrypy/repos/community-staging-any/
  python-cherrypy/repos/community-staging-any/PKGBUILD
    (from rev 1059220, python-cherrypy/trunk/PKGBUILD)
  python-cherrypy/repos/community-staging-any/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch
    (from rev 1059220, python-cherrypy/trunk/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch)
  python-cherrypy/repos/community-staging-any/disable-broken-testCombinedTools.patch
    (from rev 1059220, python-cherrypy/trunk/disable-broken-testCombinedTools.patch)
  python-cherrypy/repos/community-staging-any/disable-sessiontest-file_concurrency.patch
    (from rev 1059220, python-cherrypy/trunk/disable-sessiontest-file_concurrency.patch)

----------------------------------------------------------------+
 PKGBUILD                                                       |   70 ++++++++++
 disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch |   11 +
 disable-broken-testCombinedTools.patch                         |   13 +
 disable-sessiontest-file_concurrency.patch                     |   10 +
 4 files changed, 104 insertions(+)

Copied: python-cherrypy/repos/community-staging-any/PKGBUILD (from rev 1059220, python-cherrypy/trunk/PKGBUILD)
===================================================================
--- community-staging-any/PKGBUILD	                        (rev 0)
+++ community-staging-any/PKGBUILD	2021-12-01 11:36:21 UTC (rev 1059221)
@@ -0,0 +1,70 @@
+# 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=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' '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-staging-any/disable-broken-ServerStateTests.test_2_KeyboardInterrupt.patch (from rev 1059220, 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	2021-12-01 11:36:21 UTC (rev 1059221)
@@ -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 1059220, python-cherrypy/trunk/disable-broken-testCombinedTools.patch)
===================================================================
--- community-staging-any/disable-broken-testCombinedTools.patch	                        (rev 0)
+++ community-staging-any/disable-broken-testCombinedTools.patch	2021-12-01 11:36:21 UTC (rev 1059221)
@@ -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 1059220, 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	2021-12-01 11:36:21 UTC (rev 1059221)
@@ -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