From 3855f1cee042e676ffaa86194abc171d3373edd5 Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 11 Dec 2020 01:22:24 -0300 Subject: [PATCH] main/py3-requests: upgrade to 2.25.0 --- .../0001-don-t-depend-on-certifi.patch | 24 +++++++++++ .../0002-upgrade-chardet-to-4.x.patch | 42 +++++++++++++++++++ main/py3-requests/APKBUILD | 16 +++---- .../py3-requests/dont-depend-on-certifi.patch | 17 -------- main/py3-requests/update-urllib3.patch | 29 ------------- 5 files changed, 74 insertions(+), 54 deletions(-) create mode 100644 main/py3-requests/0001-don-t-depend-on-certifi.patch create mode 100644 main/py3-requests/0002-upgrade-chardet-to-4.x.patch delete mode 100644 main/py3-requests/dont-depend-on-certifi.patch delete mode 100644 main/py3-requests/update-urllib3.patch diff --git a/main/py3-requests/0001-don-t-depend-on-certifi.patch b/main/py3-requests/0001-don-t-depend-on-certifi.patch new file mode 100644 index 00000000000..414ed2f885e --- /dev/null +++ b/main/py3-requests/0001-don-t-depend-on-certifi.patch @@ -0,0 +1,24 @@ +From c67893eec31f4538dec95e208bbf418cf5f2e0de Mon Sep 17 00:00:00 2001 +From: Leo +Date: Fri, 11 Dec 2020 01:15:29 -0300 +Subject: [PATCH 1/2] don't depend on certifi + +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index e714bfa..4ff0cfe 100755 +--- a/setup.py ++++ b/setup.py +@@ -45,7 +45,6 @@ requires = [ + 'chardet>=3.0.2,<4', + 'idna>=2.5,<3', + 'urllib3>=1.21.1,<1.27', +- 'certifi>=2017.4.17' + + ] + test_requirements = [ +-- +2.29.2 + diff --git a/main/py3-requests/0002-upgrade-chardet-to-4.x.patch b/main/py3-requests/0002-upgrade-chardet-to-4.x.patch new file mode 100644 index 00000000000..d7f551267f7 --- /dev/null +++ b/main/py3-requests/0002-upgrade-chardet-to-4.x.patch @@ -0,0 +1,42 @@ +From b84d547e5bf4c468ce8b7b2f115ca665a4cd461a Mon Sep 17 00:00:00 2001 +From: Leo +Date: Fri, 11 Dec 2020 01:15:49 -0300 +Subject: [PATCH 2/2] upgrade chardet to 4.x + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 4ff0cfe..eca8bf5 100755 +--- a/setup.py ++++ b/setup.py +@@ -42,7 +42,7 @@ if sys.argv[-1] == 'publish': + packages = ['requests'] + + requires = [ +- 'chardet>=3.0.2,<4', ++ 'chardet>=4.0.0,<5', + 'idna>=2.5,<3', + 'urllib3>=1.21.1,<1.27', + +-- +2.29.2 + +diff --git a/requests/__init__.py b/requests/__init__.py +index c00f556..11f0e97 100644 +--- a/requests/__init__.py ++++ b/requests/__init__.py +@@ -66,9 +66,9 @@ def check_compatibility(urllib3_version, chardet_version): + major, minor, patch = chardet_version.split('.')[:3] + major, minor, patch = int(major), int(minor), int(patch) + # chardet >= 3.0.2, < 3.1.0 +- assert major == 3 +- assert minor < 1 +- assert patch >= 2 ++ assert major == 4 ++ assert minor >= 0 ++ assert patch >= 0 + + + def _check_cryptography(cryptography_version): diff --git a/main/py3-requests/APKBUILD b/main/py3-requests/APKBUILD index 37925d428e1..c096df91346 100644 --- a/main/py3-requests/APKBUILD +++ b/main/py3-requests/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: Drew DeVault pkgname=py3-requests _pkgname=requests -pkgver=2.24.0 -pkgrel=3 -pkgdesc="A HTTP request library for Python3" +pkgver=2.25.0 +pkgrel=0 +pkgdesc="HTTP request library for Python3" url="http://www.python-requests.org/" arch="noarch" license="Apache-2.0" @@ -18,8 +18,8 @@ makedepends="py3-setuptools" source=" https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz certs.patch - dont-depend-on-certifi.patch - update-urllib3.patch + 0001-don-t-depend-on-certifi.patch + 0002-upgrade-chardet-to-4.x.patch " builddir="$srcdir/$_pkgname-$pkgver" @@ -34,7 +34,7 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="46ca8ab70eb39be8398c242404b9b3ffb6baddd5c78eaad125b55c719154eb8c7b6a737a8dc587b0cb51b3b9a074abaa8b2ff347a64d38f4f90cdba4db16a119 requests-2.24.0.tar.gz +sha512sums="dd13ccb6bcd95bdd31a414dba67e5a0914ff172ae6f5d255849837e8e2a7e404e3c02fc3d07e5ff6dc81c12d0fe56c3b83bc62bc377dd3f504b00b97b144db74 requests-2.25.0.tar.gz 424a3bb01b23409284f6c9cd2bc22d92df31b85cfd96e1d1b16b5d68adeca670dfed4fff7977d8b10980102b0f780eacc465431021fcd661f3a17168a02a39a3 certs.patch -4d1373825f1befba2e1335f65f980de7a55168d05ada9a3f1c566893322e1330f2f61fcaaa51efebe3962e73e843e500ce79c1a9def0c9d4044dc74beb460f9e dont-depend-on-certifi.patch -e941d079bf8bed36a7e149a22b1397286c7c8e07e61725d2534ea03617c8155c92b8863ce044d144e1f9adbe782a6f514c13c8bd14ad71b643d4c22f92ebf750 update-urllib3.patch" +717b031b837cdbf507fef47b9408ed9c607f82cdc5b786172626e98cb1ac666cd2fb9fafc541a60c551a3fdd22a437056d8faf57fd6b451e34c562d673bee0c6 0001-don-t-depend-on-certifi.patch +e317d824a3826dee5b2b0bd8bce35136f807d2378f2dcc751b0e3e1ea7ce6349f3c4c392602b11e658abf350b18d2c01c041ecf80f18a9e44021cfcbfa9fb0a1 0002-upgrade-chardet-to-4.x.patch" diff --git a/main/py3-requests/dont-depend-on-certifi.patch b/main/py3-requests/dont-depend-on-certifi.patch deleted file mode 100644 index 184c5c430ce..00000000000 --- a/main/py3-requests/dont-depend-on-certifi.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream: Not applicable -Reason: Make it not depend on certifi, we patch system certificates in - -diff --git a/setup.py b/setup.py -index 2da9ba0..5147636 100755 ---- a/setup.py -+++ b/setup.py -@@ -44,8 +44,7 @@ packages = ['requests'] - requires = [ - 'chardet>=3.0.2,<4', - 'idna>=2.5,<3', -- 'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1', -- 'certifi>=2017.4.17' -+ 'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1' - - ] - test_requirements = [ diff --git a/main/py3-requests/update-urllib3.patch b/main/py3-requests/update-urllib3.patch deleted file mode 100644 index 9104a26d26d..00000000000 --- a/main/py3-requests/update-urllib3.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream: Adapted from https://github.com/psf/requests/pull/5651 -Reason: Fixes warning about urllib3 being outdated - -diff --git a/requests/__init__.py b/requests/__init__.py -index db090aa..04ab8ea 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.25 - assert major == 1 - assert minor >= 21 -- assert minor <= 25 -+ assert minor <= 26 - - # Check chardet for compatibility. - major, minor, patch = chardet_version.split('.')[:3] -diff --git a/setup.py b/setup.py -index 5147636..cca8b94 100755 ---- a/setup.py -+++ b/setup.py -@@ -44,7 +44,7 @@ packages = ['requests'] - requires = [ - 'chardet>=3.0.2,<4', - 'idna>=2.5,<3', -- 'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1' -+ 'urllib3>=1.21.1,<1.27' - - ] - test_requirements = [