diff options
| author | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2019-04-26 13:49:38 +0200 |
|---|---|---|
| committer | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2019-05-08 19:42:21 +0200 |
| commit | 245d3b69a4aa90ff941042c9e4f99aee8c7d83a4 (patch) | |
| tree | cddae7535e12b3e7d58181d84d92c06c55215fa3 /lang/python | |
| parent | dad7c2eaafee6080a33df1675bea021a6fd47dbe (diff) | |
python-requests: allow urllib3 1.25.x
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/python-requests/Makefile | 2 | ||||
| -rw-r--r-- | lang/python/python-requests/patches/0001-Allow-urllib3-125x.patch | 33 |
2 files changed, 34 insertions, 1 deletions
diff --git a/lang/python/python-requests/Makefile b/lang/python/python-requests/Makefile index 36b7302d6..a3b26f968 100644 --- a/lang/python/python-requests/Makefile +++ b/lang/python/python-requests/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-requests PKG_VERSION:=2.21.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=Apache-2.0 PKG_SOURCE:=requests-$(PKG_VERSION).tar.gz diff --git a/lang/python/python-requests/patches/0001-Allow-urllib3-125x.patch b/lang/python/python-requests/patches/0001-Allow-urllib3-125x.patch new file mode 100644 index 000000000..e004e662d --- /dev/null +++ b/lang/python/python-requests/patches/0001-Allow-urllib3-125x.patch @@ -0,0 +1,33 @@ +Commit in requests repository - urllib1.25 branch: https://github.com/kennethreitz/requests/commit/d6b5b401e8d6141bcefa4a70ff1c836aa085120b +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.0', + 'certifi>=2017.4.17' + + ] |