aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2021-01-08 13:36:09 -0300
committerLeo <thinkabit.ukim@gmail.com>2021-01-08 16:52:04 +0000
commit26a38cae97cdac877d9a55e475c69cb57702a5ee (patch)
treea678bc3c56763d4d9583fc70cf79d080780b3b67
parent83ecc920ca3f4d8da736ebe51f9707c6d5a234e6 (diff)
main/py3-requests: allow idna-3 to be used
Fixes #12282
-rw-r--r--main/py3-requests/0001-don-t-depend-on-certifi.patch7
-rw-r--r--main/py3-requests/0002-allow-idna-3.patch15
-rw-r--r--main/py3-requests/APKBUILD6
3 files changed, 21 insertions, 7 deletions
diff --git a/main/py3-requests/0001-don-t-depend-on-certifi.patch b/main/py3-requests/0001-don-t-depend-on-certifi.patch
index 414ed2f885e..c91741724b8 100644
--- a/main/py3-requests/0001-don-t-depend-on-certifi.patch
+++ b/main/py3-requests/0001-don-t-depend-on-certifi.patch
@@ -8,17 +8,14 @@ Subject: [PATCH 1/2] don't depend on certifi
1 file changed, 1 deletion(-)
diff --git a/setup.py b/setup.py
-index e714bfa..4ff0cfe 100755
+index 7ba4b2a..065eb22 100755
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,6 @@ requires = [
- 'chardet>=3.0.2,<4',
+ 'chardet>=3.0.2,<5',
'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-allow-idna-3.patch b/main/py3-requests/0002-allow-idna-3.patch
new file mode 100644
index 00000000000..2ac9b13a8eb
--- /dev/null
+++ b/main/py3-requests/0002-allow-idna-3.patch
@@ -0,0 +1,15 @@
+According to https://github.com/psf/requests/pull/5711
+
+diff --git a/setup.py b/setup.py
+index 065eb22..3b7b229 100755
+--- a/setup.py
++++ b/setup.py
+@@ -43,7 +43,7 @@ packages = ['requests']
+
+ requires = [
+ 'chardet>=3.0.2,<5',
+- 'idna>=2.5,<3',
++ 'idna>=2.5,<3.2',
+ 'urllib3>=1.21.1,<1.27',
+
+ ]
diff --git a/main/py3-requests/APKBUILD b/main/py3-requests/APKBUILD
index 629971201d1..1b842bcea5f 100644
--- a/main/py3-requests/APKBUILD
+++ b/main/py3-requests/APKBUILD
@@ -3,7 +3,7 @@
pkgname=py3-requests
_pkgname=requests
pkgver=2.25.1
-pkgrel=0
+pkgrel=1
pkgdesc="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
0001-don-t-depend-on-certifi.patch
+ 0002-allow-idna-3.patch
"
builddir="$srcdir/$_pkgname-$pkgver"
@@ -35,4 +36,5 @@ package() {
sha512sums="ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45 requests-2.25.1.tar.gz
424a3bb01b23409284f6c9cd2bc22d92df31b85cfd96e1d1b16b5d68adeca670dfed4fff7977d8b10980102b0f780eacc465431021fcd661f3a17168a02a39a3 certs.patch
-717b031b837cdbf507fef47b9408ed9c607f82cdc5b786172626e98cb1ac666cd2fb9fafc541a60c551a3fdd22a437056d8faf57fd6b451e34c562d673bee0c6 0001-don-t-depend-on-certifi.patch"
+cbc5021d7bd760977aefab68eaa8dfafdc8fbfd89f1c43fc9bac09944158ed971023570c7c2ab56968a6072d4d187447c97bd2a8c5b648928a310383fe392378 0001-don-t-depend-on-certifi.patch
+6066a270c03cdc765915a4d4664c9be62954dc5d7fc00b0fb9d0db113c3ce0fe024bf874847a9eb60a63d2bbfc0c7b11606474c9893b0ad90f25eb2bd354be0a 0002-allow-idna-3.patch"