From 70be46618d2a3fcf85167063402ab3c72a2d81a6 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Thu, 16 May 2019 23:26:33 +0200 Subject: [PATCH] python-requests: update to version 2.22.0 Remove patch, which is included in this release Signed-off-by: Josef Schlehofer --- lang/python/python-requests/Makefile | 6 ++-- .../patches/0001-Allow-urllib3-125x.patch | 33 ------------------- 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 lang/python/python-requests/patches/0001-Allow-urllib3-125x.patch diff --git a/lang/python/python-requests/Makefile b/lang/python/python-requests/Makefile index 1b8b981b0..3c823893c 100644 --- a/lang/python/python-requests/Makefile +++ b/lang/python/python-requests/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-requests -PKG_VERSION:=2.21.0 -PKG_RELEASE:=3 +PKG_VERSION:=2.22.0 +PKG_RELEASE:=1 PKG_MAINTAINER:=Josef Schlehofer , Alexandru Ardelean PKG_LICENSE:=Apache-2.0 @@ -18,7 +18,7 @@ PKG_CPE_ID:=cpe:/a:python-requests:requests PKG_SOURCE:=requests-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/r/requests -PKG_HASH:=502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e +PKG_HASH:=11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-requests-$(PKG_VERSION) diff --git a/lang/python/python-requests/patches/0001-Allow-urllib3-125x.patch b/lang/python/python-requests/patches/0001-Allow-urllib3-125x.patch deleted file mode 100644 index e004e662d..000000000 --- a/lang/python/python-requests/patches/0001-Allow-urllib3-125x.patch +++ /dev/null @@ -1,33 +0,0 @@ -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' - - ]