Update to 2.12.1 (#1395469)

.gitignore

@@ -27,3 +27,4 @@
 /requests-2.10.0.tar.gz
 /requests-2.11.0.tar.gz
 /requests-2.11.1.tar.gz
+/requests-2.12.1.tar.gz

python-requests-urllib3-at-1.16.patch

@@ -1,27 +0,0 @@
-From 3ef00c66939e0b6d2d95756f73c1d2fe716ddf40 Mon Sep 17 00:00:00 2001
-From: Ralph Bean <rbean@redhat.com>
-Date: Tue, 3 May 2016 10:56:53 -0400
-Subject: [PATCH] Pin urllib3 to 1.16
-
----
- setup.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 3a39052..662e0ef 100755
---- a/setup.py
-+++ b/setup.py
-@@ -44,7 +44,9 @@ packages = [
-     'requests.packages.urllib3.packages.ssl_match_hostname',
- ]
- 
--requires = []
-+requires = [
-+    'urllib3==1.16',
-+]
- test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov']
- 
- with open('requests/__init__.py', 'r') as fd:
--- 
-2.5.5
-

python-requests-urllib3-at-1.19.1.patch

@@ -0,0 +1,26 @@
+From 417c2b103a7c4be9dcc2072d9c6c61e687fbe657 Mon Sep 17 00:00:00 2001
+From: Jeremy Cline <jeremy@jcline.org>
+Date: Thu, 17 Nov 2016 17:02:22 -0500
+Subject: [PATCH] python requests urllib3 at 1.19.1
+
+Signed-off-by: Jeremy Cline <jeremy@jcline.org>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index c240624..bfadfb9 100755
+--- a/setup.py
++++ b/setup.py
+@@ -46,7 +46,7 @@ packages = [
+     'requests.packages.urllib3.packages.backports',
+ ]
+ 
+-requires = []
++requires = ['urllib3==1.19.1']
+ test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov']
+ 
+ with open('requests/__init__.py', 'r') as fd:
+-- 
+2.9.3
+

python-requests.spec

@@ -7,10 +7,10 @@
 %{!?python3_pkgversion: %global python3_pkgversion 34}
 %endif
 
-%global urllib3_unbundled_version 1.16
+%global urllib3_unbundled_version 1.19.1
 
 Name:           python-requests
-Version:        2.11.1
+Version:        2.12.1
 Release:        1%{?dist}
 Summary:        HTTP library, written in Python, for human beings
 
@@ -51,6 +51,7 @@ BuildRequires:  python2-urllib3 == %{urllib3_unbundled_version}
 Requires:       ca-certificates
 Requires:       python-chardet
 Requires:       python2-urllib3 == %{urllib3_unbundled_version}
+Requires:       python-idna
 
 %if 0%{?rhel} && 0%{?rhel} <= 6
 BuildRequires:  python-ordereddict
@@ -74,6 +75,7 @@ BuildRequires:  python%{python3_pkgversion}-chardet
 BuildRequires:  python%{python3_pkgversion}-urllib3 == %{urllib3_unbundled_version}
 Requires:       python%{python3_pkgversion}-chardet
 Requires:       python%{python3_pkgversion}-urllib3 == %{urllib3_unbundled_version}
+Requires:       python%{python3_pkgversion}-idna
 
 %description -n python%{python3_pkgversion}-requests
 Most existing Python modules for sending HTTP requests are extremely verbose and
@@ -105,6 +107,7 @@ pushd %{py3dir}
 # Unbundle chardet and urllib3.  We replace these with symlinks to system libs.
 rm -rf build/lib/requests/packages/chardet
 rm -rf build/lib/requests/packages/urllib3
+rm -rf build/lib/requests/packages/idna
 
 popd
 %endif
@@ -114,6 +117,7 @@ popd
 # Unbundle chardet and urllib3.  We replace these with symlinks to system libs.
 rm -rf build/lib/requests/packages/chardet
 rm -rf build/lib/requests/packages/urllib3
+rm -rf build/lib/requests/packages/idna
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -122,12 +126,14 @@ pushd %{py3dir}
 %{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT
 ln -s ../../chardet %{buildroot}/%{python3_sitelib}/requests/packages/chardet
 ln -s ../../urllib3 %{buildroot}/%{python3_sitelib}/requests/packages/urllib3
+ln -s ../../idna %{buildroot}/%{python3_sitelib}/requests/packages/idna
 popd
 %endif
 
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 ln -s ../../chardet %{buildroot}/%{python2_sitelib}/requests/packages/chardet
 ln -s ../../urllib3 %{buildroot}/%{python2_sitelib}/requests/packages/urllib3
+ln -s ../../idna %{buildroot}/%{python2_sitelib}/requests/packages/idna
 
 ## The tests succeed if run locally, but fail in koji.
 ## They require an active network connection to query httpbin.org
@@ -169,6 +175,10 @@ popd
 %endif
 
 %changelog
+* Thu Nov 17 2016 Jeremy Cline <jeremy@jcline.org> - 2.12.1-1
+- Update to 2.12.1. Fixes #1395469
+- Unbundle idna, a new upstream dependency
+
 * Sat Aug 27 2016 Kevin Fenzi <kevin@scrye.com> - 2.11.1-1
 - Update to 2.11.1. Fixes #1370814
 

sources

@@ -1 +1 @@
-ad5f9c47b5c5dfdb28363ad7546b0763  requests-2.11.1.tar.gz
+8c8ff05ea401ea22718038c3a416ea50  requests-2.12.1.tar.gz