commit: 46e10fb955b5fee21e996f6dcaab3224e1f676b8 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sat Jan 16 08:26:17 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sat Jan 16 20:56:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46e10fb9
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 <AT> gmail.com> Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild | 6 +++++- dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild | 6 +++++- dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild | 4 ++++ dev-python/aiohttp/aiohttp-3.7.3.ebuild | 4 ++++ 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 ef61f9018de..f2f830a1b52 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 f34cfded7a1..17dce8e4e1a 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 85a66310ae9..be58c081574 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 f2191ebd9c4..150a28290d8 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
