commit: eba4b4d9c051e426e2e61a5d6b44f6382a8ce98c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jun 24 06:01:47 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jun 24 06:01:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eba4b4d9
dev-python/requests: backport charset-normalizer dep fix to stable Closes: https://bugs.gentoo.org/853247 Signed-off-by: Sam James <sam <AT> gentoo.org> .../requests-2.27.1-unpin-charset-normalizer.patch | 25 ++++++++++++++++++++++ .../requests-2.28.0-unpin-charset-normalizer.patch | 2 -- ...-2.27.1-r1.ebuild => requests-2.27.1-r2.ebuild} | 4 ++++ 3 files changed, 29 insertions(+), 2 deletions(-) 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 new file mode 100644 index 000000000000..418cb519ffb6 --- /dev/null +++ b/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch @@ -0,0 +1,25 @@ +https://github.com/psf/requests/pull/6169 +https://bugs.gentoo.org/853247 + +--- a/requests.egg-info/requires.txt ++++ b/requests.egg-info/requires.txt +@@ -6,7 +6,7 @@ chardet<5,>=3.0.2 + idna<3,>=2.5 + + [:python_version >= "3"] +-charset_normalizer~=2.0.0 ++charset_normalizer~=2.0 + idna<4,>=2.5 + + [security] +--- a/setup.py ++++ b/setup.py +@@ -41,7 +41,7 @@ if sys.argv[-1] == 'publish': + packages = ['requests'] + + requires = [ +- 'charset_normalizer~=2.0.0; python_version >= "3"', ++ 'charset_normalizer~=2.0; python_version >= "3"', + 'chardet>=3.0.2,<5; python_version < "3"', + 'idna>=2.5,<3; python_version < "3"', + 'idna>=2.5,<4; python_version >= "3"', 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 index b9f3a04aa02e..d4a4a1596296 100644 --- 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 @@ -18,8 +18,6 @@ Subject: [PATCH] Allow charset normalizer >=2 and <3 "urllib3>=1.21.1,<1.27", "certifi>=2017.4.17", -diff --git a/setup.cfg b/setup.cfg -index 751c171..99166ef 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ provides-extra = diff --git a/dev-python/requests/requests-2.27.1-r1.ebuild b/dev-python/requests/requests-2.27.1-r2.ebuild similarity index 96% rename from dev-python/requests/requests-2.27.1-r1.ebuild rename to dev-python/requests/requests-2.27.1-r2.ebuild index 64d160cf6d34..ecfd2cc3e0ee 100644 --- a/dev-python/requests/requests-2.27.1-r1.ebuild +++ b/dev-python/requests/requests-2.27.1-r2.ebuild @@ -42,6 +42,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-2.27.1-unpin-charset-normalizer.patch +) + distutils_enable_tests pytest python_test() {
