diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-11-11 16:42:11 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-11-11 16:42:28 -0300 |
| commit | 73b832502c7c3027beeaae46b1eacd16f9439262 (patch) | |
| tree | f0cbf6ad0bc59966a5422ea48f96d39e2b242470 | |
| parent | 1733d893cb3738b0627295050646aeefb0e4bd62 (diff) | |
main/py3-requests: fix warning about unsupported urllib3
| -rw-r--r-- | main/py3-requests/APKBUILD | 6 | ||||
| -rw-r--r-- | main/py3-requests/update-urllib3.patch | 29 |
2 files changed, 33 insertions, 2 deletions
diff --git a/main/py3-requests/APKBUILD b/main/py3-requests/APKBUILD index d5455d607fb..37925d428e1 100644 --- a/main/py3-requests/APKBUILD +++ b/main/py3-requests/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-requests _pkgname=requests pkgver=2.24.0 -pkgrel=2 +pkgrel=3 pkgdesc="A HTTP request library for Python3" url="http://www.python-requests.org/" arch="noarch" @@ -19,6 +19,7 @@ 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 " builddir="$srcdir/$_pkgname-$pkgver" @@ -35,4 +36,5 @@ package() { sha512sums="46ca8ab70eb39be8398c242404b9b3ffb6baddd5c78eaad125b55c719154eb8c7b6a737a8dc587b0cb51b3b9a074abaa8b2ff347a64d38f4f90cdba4db16a119 requests-2.24.0.tar.gz 424a3bb01b23409284f6c9cd2bc22d92df31b85cfd96e1d1b16b5d68adeca670dfed4fff7977d8b10980102b0f780eacc465431021fcd661f3a17168a02a39a3 certs.patch -4d1373825f1befba2e1335f65f980de7a55168d05ada9a3f1c566893322e1330f2f61fcaaa51efebe3962e73e843e500ce79c1a9def0c9d4044dc74beb460f9e dont-depend-on-certifi.patch" +4d1373825f1befba2e1335f65f980de7a55168d05ada9a3f1c566893322e1330f2f61fcaaa51efebe3962e73e843e500ce79c1a9def0c9d4044dc74beb460f9e dont-depend-on-certifi.patch +e941d079bf8bed36a7e149a22b1397286c7c8e07e61725d2534ea03617c8155c92b8863ce044d144e1f9adbe782a6f514c13c8bd14ad71b643d4c22f92ebf750 update-urllib3.patch" diff --git a/main/py3-requests/update-urllib3.patch b/main/py3-requests/update-urllib3.patch new file mode 100644 index 00000000000..9104a26d26d --- /dev/null +++ b/main/py3-requests/update-urllib3.patch @@ -0,0 +1,29 @@ +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 = [ |