[arch-commits] Commit in python-urllib3/trunk (PKGBUILD tornado-4.3.patch)

[Felix Yan]

    Date: Friday, July 21, 2017 @ 15:28:16
  Author: felixonmars
Revision: 300888

upgpkg: python-urllib3 1.22-1

Added:
  python-urllib3/trunk/tornado-4.3.patch
Modified:
  python-urllib3/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   20 +++++++++++++-------
 tornado-4.3.patch |   23 +++++++++++++++++++++++
 2 files changed, 36 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-21 14:03:34 UTC (rev 300887)
+++ PKGBUILD	2017-07-21 15:28:16 UTC (rev 300888)
@@ -6,7 +6,7 @@
 
 pkgbase=python-urllib3
 pkgname=(python-urllib3 python2-urllib3 python-urllib3-doc)
-pkgver=1.21.1
+pkgver=1.22
 pkgrel=1
 pkgdesc="HTTP library with thread-safe connection pooling and file post support"
 arch=("any")
@@ -15,12 +15,18 @@
 makedepends=('python-setuptools' 'python2-setuptools' 'python2-sphinx' 'python-ndg-httpsclient'
              'python2-ndg-httpsclient' 'python-pyasn1' 'python2-pyasn1' 'python-pyopenssl'
              'python2-pyopenssl' 'python-pysocks' 'python2-pysocks' 'python-mock' 'python2-mock')
-checkdepends=('python-nose' 'python2-nose' 'python-tornado' 'python2-tornado' 'python-coverage'
-              'python2-coverage' 'python-psutil' 'python2-psutil')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/shazow/urllib3/archive/$pkgver.tar.gz")
-md5sums=('b0a2c692ea273dc120b209a027b0df3c')
+checkdepends=('python-pytest-runner' 'python2-pytest-runner' 'python-tornado' 'python2-tornado'
+              'python-nose' 'python2-nose' 'python-psutil' 'python2-psutil'
+              'python-gcp-devrel-py-tools' 'python2-gcp-devrel-py-tools')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/shazow/urllib3/archive/$pkgver.tar.gz"
+        tornado-4.3.patch)
+sha512sums=('1b45a4a64e71847a4fc62b9263235d5b05b62076698fa324454efeb7ad065abd702cc9eadb2d396d9270b07e91e9bad94c52a4b9b115aadccb27f81955e6feab'
+            '7c09acefa963a80379f8b2f3f2c2c7546ec62025058c1ae024bc954d49392d7956b8b3ceaed40b3d3ab06bcf9c74bfb4214425b66cc55c50ffc2642e2d35c498')
 
 prepare() {
+  # https://github.com/shazow/urllib3/pull/1236
+  (cd urllib3-$pkgver; patch -p1 -i ../tornado-4.3.patch)
+
   cp -a urllib3-$pkgver{,-py2}
 }
 
@@ -38,10 +44,10 @@
 
 check() {
   cd "$srcdir"/urllib3-$pkgver
-  nosetests3 || warning "Tests failed"
+  python setup.py pytest
 
   cd "$srcdir"/urllib3-$pkgver-py2
-  nosetests2 || warning "Tests failed"
+  python2 setup.py pytest
 }
 
 package_python-urllib3() {

Added: tornado-4.3.patch
===================================================================
--- tornado-4.3.patch	                        (rev 0)
+++ tornado-4.3.patch	2017-07-21 15:28:16 UTC (rev 300888)
@@ -0,0 +1,23 @@
+From 39eebb652db570cf51994f404da3dd91c8a9f4cc Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars at archlinux.org>
+Date: Fri, 21 Jul 2017 23:25:35 +0800
+Subject: [PATCH] Fix compatibility with tornado 4.3+
+
+`HTTPHeaders` is not JSON serializable, so make it a dict first.
+---
+ dummyserver/handlers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py
+index a943b836b..b91fe7215 100644
+--- a/dummyserver/handlers.py
++++ b/dummyserver/handlers.py
+@@ -225,7 +225,7 @@ def encodingrequest(self, request):
+         return Response(data, headers=headers)
+ 
+     def headers(self, request):
+-        return Response(json.dumps(request.headers))
++        return Response(json.dumps(dict(request.headers)))
+ 
+     def successful_retry(self, request):
+         """ Handler which will return an error and then success