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

[Thore Bödecker]

    Date: Thursday, November 21, 2019 @ 13:24:05
  Author: foxxx0
Revision: 531046

upgpkg: python-cherrypy 18.4.0-1

update to 18.4.0

Modified:
  python-cherrypy/trunk/PKGBUILD
Deleted:
  python-cherrypy/trunk/disable-broken-HTTP11-timeout-test.patch

------------------------------------------+
 PKGBUILD                                 |   10 ++---
 disable-broken-HTTP11-timeout-test.patch |   57 -----------------------------
 2 files changed, 4 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-21 12:56:16 UTC (rev 531045)
+++ PKGBUILD	2019-11-21 13:24:05 UTC (rev 531046)
@@ -8,8 +8,8 @@
 
 pkgname='python-cherrypy'
 _pkgname="${pkgname#python-}"
-pkgver=18.3.0
-pkgrel=3
+pkgver=18.4.0
+pkgrel=1
 pkgdesc='A pythonic, object-oriented web development framework'
 arch=('any')
 url='https://cherrypy.org'
@@ -22,11 +22,9 @@
 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')
+sha512sums=('8ebfcdf00d488f475e33aa2cd36c46b717a37ada80042067a5ef3ee472f42cf2043743aff12802214eabd3e7ea24ccbb51fc665ebe4c0fbed023698955ea88a8'
+            'e8abb7e3f8a064a0da529fcaf393dff305541bc273b539f3129b119d506be3be8cd67894dd4223e067b4dd8b55df8adc5d4feddb8d87188c9e528670c39e252f')
 
 prepare() {
   cd "${srcdir}/${_pkgname}-${pkgver}"

Deleted: disable-broken-HTTP11-timeout-test.patch
===================================================================
--- disable-broken-HTTP11-timeout-test.patch	2019-11-21 12:56:16 UTC (rev 531045)
+++ disable-broken-HTTP11-timeout-test.patch	2019-11-21 13:24:05 UTC (rev 531046)
@@ -1,57 +0,0 @@
-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