Don't print runtime warning about urllib3 v1.23 (rhbz 1589306)

Signed-off-by: Jeremy Cline <jcline@redhat.com>
This commit is contained in:
Jeremy Cline 2018-06-08 12:18:08 -04:00
parent 9191e71974
commit c670b3bcc3
No known key found for this signature in database
GPG Key ID: 9223308FA9B246DB
2 changed files with 34 additions and 1 deletions

View File

@ -25,3 +25,32 @@ index ed4892d4..e113510c 100755
-- --
2.17.1 2.17.1
From 015347ed9622f526f045b2199a82ee57269c1260 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Thu, 7 Jun 2018 11:58:46 -0400
Subject: [PATCH] Don't warn about compatibility with urllib3 v1.23
Requests allows v1.23 in #4669, but the compatibility check at import
time still looks for 22. Bump the version to 23.
Signed-off-by: Jeremy Cline <jcline@redhat.com>
---
requests/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requests/__init__.py b/requests/__init__.py
index 6fa855df..03decf8c 100644
--- a/requests/__init__.py
+++ b/requests/__init__.py
@@ -60,7 +60,7 @@ def check_compatibility(urllib3_version, chardet_version):
# urllib3 >= 1.21.1, <= 1.22
assert major == 1
assert minor >= 21
- assert minor <= 22
+ assert minor <= 23
# Check chardet for compatibility.
major, minor, patch = chardet_version.split('.')[:3]
--
2.17.1

View File

@ -10,7 +10,7 @@
Name: python-requests Name: python-requests
Version: 2.18.4 Version: 2.18.4
Release: 5%{?dist} Release: 6%{?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,7 @@ 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
# Temporary fixes to work with urllib3 until requests-2.19 is tagged upstream
Patch5: Allow-urllib3-1.23.patch Patch5: Allow-urllib3-1.23.patch
BuildArch: noarch BuildArch: noarch
@ -149,6 +150,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
%changelog %changelog
* Fri Jun 08 2018 Jeremy Cline <jeremy@jcline.org> - 2.18.4-6
- Don't print runtime warning about urllib3 v1.23 (rhbz 1589306)
* Tue Jun 05 2018 Jeremy Cline <jeremy@jcline.org> - 2.18.4-5 * Tue Jun 05 2018 Jeremy Cline <jeremy@jcline.org> - 2.18.4-5
- Allow urllib3 v1.23 (rhbz 1586311) - Allow urllib3 v1.23 (rhbz 1586311)