From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3783A158094 for ; Fri, 24 Jun 2022 06:02:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 770BFE07D0; Fri, 24 Jun 2022 06:02:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 466E0E07D0 for ; Fri, 24 Jun 2022 06:02:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF96B34197D for ; Fri, 24 Jun 2022 06:01:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2F3F3C3 for ; Fri, 24 Jun 2022 06:01:56 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1656050507.eba4b4d9c051e426e2e61a5d6b44f6382a8ce98c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/files/, dev-python/requests/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch dev-python/requests/requests-2.27.1-r1.ebuild dev-python/requests/requests-2.27.1-r2.ebuild X-VCS-Directories: dev-python/requests/ dev-python/requests/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: eba4b4d9c051e426e2e61a5d6b44f6382a8ce98c X-VCS-Branch: master Date: Fri, 24 Jun 2022 06:01:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0b3667be-577b-4df4-873a-6094df531b5c X-Archives-Hash: 92c869e72caadd51d881f7f8359a9aca commit: eba4b4d9c051e426e2e61a5d6b44f6382a8ce98c Author: Sam James gentoo org> AuthorDate: Fri Jun 24 06:01:47 2022 +0000 Commit: Sam James gentoo 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 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() {