summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2021-01-16 09:26:17 +0100
committerZac Medico <zmedico@gentoo.org>2021-01-16 12:56:22 -0800
commit46e10fb955b5fee21e996f6dcaab3224e1f676b8 (patch)
treee20625d548994feeb9efc9b02485c028631ac289
parentsys-apps/flatpak: Remove vulnerable version 1.8.2 (diff)
downloadgentoo-46e10fb955b5fee21e996f6dcaab3224e1f676b8.tar.gz
gentoo-46e10fb955b5fee21e996f6dcaab3224e1f676b8.tar.bz2
gentoo-46e10fb955b5fee21e996f6dcaab3224e1f676b8.zip
dev-python/aiohttp: support newer chardet version
Closes: https://github.com/gentoo/gentoo/pull/18598 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rw-r--r--dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild6
-rw-r--r--dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild6
-rw-r--r--dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild4
-rw-r--r--dev-python/aiohttp/aiohttp-3.7.3.ebuild4
4 files changed, 18 insertions, 2 deletions
diff --git a/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild b/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
index ef61f9018dea..f2f830a1b522 100644
--- a/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -140,6 +140,10 @@ python_prepare_all() {
sed -e 's:test_proxy_https_bad_response:_&:' \
-i tests/test_proxy_functional.py || die
+ # newer chardet works too
+ sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
+ -i setup.py aiohttp.egg-info/requires.txt || die
+
distutils-r1_python_prepare_all
}
diff --git a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
index f34cfded7a1e..17dce8e4e1a0 100644
--- a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -70,6 +70,10 @@ python_prepare_all() {
sed -e 's:test_mark_formdata_as_processed:_&:' \
-i tests/test_formdata.py || die
+ # newer chardet works too
+ sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
+ -i setup.py aiohttp.egg-info/requires.txt || die
+
# takes a very long time, then fails
rm tests/test_pytest_plugin.py || die
diff --git a/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
index 85a66310ae9b..be58c0815747 100644
--- a/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
@@ -71,6 +71,10 @@ python_prepare_all() {
sed -e 's:test_mark_formdata_as_processed:_&:' \
-i tests/test_formdata.py || die
+ # newer chardet works too
+ sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
+ -i setup.py aiohttp.egg-info/requires.txt || die
+
# takes a very long time, then fails
rm tests/test_pytest_plugin.py || die
diff --git a/dev-python/aiohttp/aiohttp-3.7.3.ebuild b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
index f2191ebd9c45..150a28290d88 100644
--- a/dev-python/aiohttp/aiohttp-3.7.3.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
@@ -71,6 +71,10 @@ python_prepare_all() {
sed -e 's:test_mark_formdata_as_processed:_&:' \
-i tests/test_formdata.py || die
+ # newer chardet works too
+ sed -e 's|chardet>=2.0,<4.0|chardet>=2.0|' \
+ -i setup.py aiohttp.egg-info/requires.txt || die
+
# takes a very long time, then fails
rm tests/test_pytest_plugin.py || die