-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
python-requests: allow urllib3 1.25.x
Add PKG_CPE_ID Add PKG_LICENSE_FILES Update URL Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
- Loading branch information
Showing
2 changed files
with
40 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
lang/python/python-requests/patches/Allow-urllib3-125x.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
Pull request: https://github.com/kennethreitz/requests/pull/5063 | ||
|
||
diff --git a/requests/__init__.py b/requests/__init__.py | ||
index bc168ee..9a899df 100644 | ||
--- a/requests/__init__.py | ||
+++ b/requests/__init__.py | ||
@@ -57,10 +57,10 @@ def check_compatibility(urllib3_version, chardet_version): | ||
# Check urllib3 for compatibility. | ||
major, minor, patch = urllib3_version # noqa: F811 | ||
major, minor, patch = int(major), int(minor), int(patch) | ||
- # urllib3 >= 1.21.1, <= 1.24 | ||
+ # urllib3 >= 1.21.1, <= 1.25 | ||
assert major == 1 | ||
assert minor >= 21 | ||
- assert minor <= 24 | ||
+ assert minor <= 25 | ||
|
||
# Check chardet for compatibility. | ||
major, minor, patch = chardet_version.split('.')[:3] | ||
diff --git a/setup.py b/setup.py | ||
index 10ce2c6..0d5d0cc 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.9', | ||
- 'urllib3>=1.21.1,<1.25', | ||
+ 'urllib3>=1.21.1,<1.26,!=1.25', | ||
'certifi>=2017.4.17' | ||
|
||
] |