Allow urllib3 v1.23 (rhbz 1586311)

This commit is contained in:
Jeremy Cline 2018-06-05 23:07:31 -04:00
parent ae81b73839
commit 9191e71974
No known key found for this signature in database
GPG Key ID: 9223308FA9B246DB
2 changed files with 33 additions and 1 deletions

27
Allow-urllib3-1.23.patch Normal file
View File

@ -0,0 +1,27 @@
From 7147b3e8280d2ae245b28e9f6ede1d9210af79ef Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Tue, 5 Jun 2018 23:00:42 -0400
Subject: [PATCH] Allow urllib3-1.23
Signed-off-by: Jeremy Cline <jcline@redhat.com>
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index ed4892d4..e113510c 100755
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ packages = ['requests']
requires = [
'chardet>=3.0.2,<3.1.0',
'idna>=2.5,<2.7',
- 'urllib3>=1.21.1,<1.23',
+ 'urllib3>=1.21.1,<1.24',
]
test_requirements = ['pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7', 'pytest>=2.8.0']
--
2.17.1

View File

@ -10,7 +10,7 @@
Name: python-requests Name: python-requests
Version: 2.18.4 Version: 2.18.4
Release: 4%{?dist} Release: 5%{?dist}
Summary: HTTP library, written in Python, for human beings Summary: HTTP library, written in Python, for human beings
License: ASL 2.0 License: ASL 2.0
@ -41,6 +41,8 @@ Patch3: requests-2.12.4-tests_nonet.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1567862 # https://bugzilla.redhat.com/show_bug.cgi?id=1567862
Patch4: Don-t-inject-pyopenssl-into-urllib3.patch Patch4: Don-t-inject-pyopenssl-into-urllib3.patch
Patch5: Allow-urllib3-1.23.patch
BuildArch: noarch BuildArch: noarch
%description %description
@ -147,6 +149,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
%changelog %changelog
* Tue Jun 05 2018 Jeremy Cline <jeremy@jcline.org> - 2.18.4-5
- Allow urllib3 v1.23 (rhbz 1586311)
* Mon Apr 16 2018 Jeremy Cline <jeremy@jcline.org> - 2.18.4-4 * Mon Apr 16 2018 Jeremy Cline <jeremy@jcline.org> - 2.18.4-4
- Stop injecting PyOpenSSL (rhbz 1567862) - Stop injecting PyOpenSSL (rhbz 1567862)