| 1 |
commit: eba4b4d9c051e426e2e61a5d6b44f6382a8ce98c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 24 06:01:47 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 24 06:01:47 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eba4b4d9 |
| 7 |
|
| 8 |
dev-python/requests: backport charset-normalizer dep fix to stable |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/853247 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../requests-2.27.1-unpin-charset-normalizer.patch | 25 ++++++++++++++++++++++ |
| 14 |
.../requests-2.28.0-unpin-charset-normalizer.patch | 2 -- |
| 15 |
...-2.27.1-r1.ebuild => requests-2.27.1-r2.ebuild} | 4 ++++ |
| 16 |
3 files changed, 29 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch b/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..418cb519ffb6 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch |
| 23 |
@@ -0,0 +1,25 @@ |
| 24 |
+https://github.com/psf/requests/pull/6169 |
| 25 |
+https://bugs.gentoo.org/853247 |
| 26 |
+ |
| 27 |
+--- a/requests.egg-info/requires.txt |
| 28 |
++++ b/requests.egg-info/requires.txt |
| 29 |
+@@ -6,7 +6,7 @@ chardet<5,>=3.0.2 |
| 30 |
+ idna<3,>=2.5 |
| 31 |
+ |
| 32 |
+ [:python_version >= "3"] |
| 33 |
+-charset_normalizer~=2.0.0 |
| 34 |
++charset_normalizer~=2.0 |
| 35 |
+ idna<4,>=2.5 |
| 36 |
+ |
| 37 |
+ [security] |
| 38 |
+--- a/setup.py |
| 39 |
++++ b/setup.py |
| 40 |
+@@ -41,7 +41,7 @@ if sys.argv[-1] == 'publish': |
| 41 |
+ packages = ['requests'] |
| 42 |
+ |
| 43 |
+ requires = [ |
| 44 |
+- 'charset_normalizer~=2.0.0; python_version >= "3"', |
| 45 |
++ 'charset_normalizer~=2.0; python_version >= "3"', |
| 46 |
+ 'chardet>=3.0.2,<5; python_version < "3"', |
| 47 |
+ 'idna>=2.5,<3; python_version < "3"', |
| 48 |
+ 'idna>=2.5,<4; python_version >= "3"', |
| 49 |
|
| 50 |
diff --git a/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch b/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch |
| 51 |
index b9f3a04aa02e..d4a4a1596296 100644 |
| 52 |
--- a/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch |
| 53 |
+++ b/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch |
| 54 |
@@ -18,8 +18,6 @@ Subject: [PATCH] Allow charset normalizer >=2 and <3 |
| 55 |
"urllib3>=1.21.1,<1.27", |
| 56 |
"certifi>=2017.4.17", |
| 57 |
|
| 58 |
-diff --git a/setup.cfg b/setup.cfg |
| 59 |
-index 751c171..99166ef 100644 |
| 60 |
--- a/setup.cfg |
| 61 |
+++ b/setup.cfg |
| 62 |
@@ -5,7 +5,7 @@ provides-extra = |
| 63 |
|
| 64 |
diff --git a/dev-python/requests/requests-2.27.1-r1.ebuild b/dev-python/requests/requests-2.27.1-r2.ebuild |
| 65 |
similarity index 96% |
| 66 |
rename from dev-python/requests/requests-2.27.1-r1.ebuild |
| 67 |
rename to dev-python/requests/requests-2.27.1-r2.ebuild |
| 68 |
index 64d160cf6d34..ecfd2cc3e0ee 100644 |
| 69 |
--- a/dev-python/requests/requests-2.27.1-r1.ebuild |
| 70 |
+++ b/dev-python/requests/requests-2.27.1-r2.ebuild |
| 71 |
@@ -42,6 +42,10 @@ BDEPEND=" |
| 72 |
) |
| 73 |
" |
| 74 |
|
| 75 |
+PATCHES=( |
| 76 |
+ "${FILESDIR}"/${PN}-2.27.1-unpin-charset-normalizer.patch |
| 77 |
+) |
| 78 |
+ |
| 79 |
distutils_enable_tests pytest |
| 80 |
|
| 81 |
python_test() { |
Archives