[arch-commits] Commit in python-cherrypy/trunk (2 files)

[Thore Bödecker]

    Date: Wednesday, April 22, 2020 @ 15:05:05
  Author: foxxx0
Revision: 617660

upgpkg: python-cherrypy 18.6.0-1: update to upstream release 18.6.0, disable broken testCombinedTools test

Added:
  python-cherrypy/trunk/disable-broken-testCombinedTools.patch
Modified:
  python-cherrypy/trunk/PKGBUILD

----------------------------------------+
 PKGBUILD                               |   25 ++++++++++++++++---------
 disable-broken-testCombinedTools.patch |   13 +++++++++++++
 2 files changed, 29 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-22 14:45:46 UTC (rev 617659)
+++ PKGBUILD	2020-04-22 15:05:05 UTC (rev 617660)
@@ -8,23 +8,28 @@
 
 pkgname='python-cherrypy'
 _pkgname="${pkgname#python-}"
-pkgver=18.5.0
-pkgrel=2
+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')
-makedepends=('python-setuptools' 'python-setuptools-scm' 'python-six'
-  'python-cheroot' 'python-portend' 'python-more-itertools' 'python-zc.lockfile')
-checkdepends=('python-tox')
+  '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=('22b3ca20cc38bbbeb87facf139824b6dda0ef1fe26aaf5a829685a660e26a559b34e32a2f665b4c2221696b366e0b190e2f6218c5f6355269b076a6de84a5555'
-            'e8abb7e3f8a064a0da529fcaf393dff305541bc273b539f3129b119d506be3be8cd67894dd4223e067b4dd8b55df8adc5d4feddb8d87188c9e528670c39e252f')
+sha512sums=('d39e9529e4872437c6d94609561820f4946f00c8ded5aa857facbd2c48e0bafb5a4b70368ad72899dad12593a4f8ea86003c1da62c763d6de0181ef24573c465'
+            'e8abb7e3f8a064a0da529fcaf393dff305541bc273b539f3129b119d506be3be8cd67894dd4223e067b4dd8b55df8adc5d4feddb8d87188c9e528670c39e252f'
+            '8160f7a0e43042c233af22712641724bbaff63d603b31eb3f058c810d2b8f1ca0f5a4666464e4492457bb665ebe0eb5da55bc7e8158e36968f5ccb08ad641733')
 
 prepare() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -47,7 +52,9 @@
 
 check() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
-  tox
+  export WEBTEST_INTERACTIVE=0
+  rm -f ./{,cherrypy/}{pytest.ini,tox.ini}
+  py.test -vvv -s -ra --showlocals --noconftest cherrypy/test/
 }
 
 package() {

Added: disable-broken-testCombinedTools.patch
===================================================================
--- disable-broken-testCombinedTools.patch	                        (rev 0)
+++ disable-broken-testCombinedTools.patch	2020-04-22 15:05:05 UTC (rev 617660)
@@ -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()