commit:     2e9e1c5cbde434794bd387136e60331c937dffa6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 12 10:46:45 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 12 10:46:45 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e9e1c5c

dev-python/requests: enable py3.14, refresh tests

* Enable py3.14
* Refresh tests
** Drop old skips
** Backport a bunch of patches that Fedora and Debian are using to fix tests
   w/ new OpenSSL + urllib3-3.4 vs new openssl
** ... but still skip one test as it stil lseems to fail, perhaps because
   of openssl-3.5.

Bug: https://bugs.gentoo.org/955435
Bug: https://github.com/psf/requests/issues/6896
Bug: https://github.com/psf/requests/pull/6897
Bug: https://github.com/psf/requests/pull/6924
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/requests/Manifest               |  1 +
 dev-python/requests/requests-2.32.3.ebuild | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index efbbda4ca0b8..1c23363adb05 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1 +1,2 @@
+DIST requests-2.32.3-patches.tar.xz 20028 BLAKE2B 
fb224c96f85d7f8f9c7c0ca7fc188ddcf12abe6239a83e4ec1fb96f949ed27007ea98a412fea2eb7d132a191ff20cec4cd0da20da10255125d8ab7890dc8c27e
 SHA512 
be04a6a55ff3184c22b20a8f185fd7c6478db44d451fe396e61687a5f58d24b915a18f94fc888f6744eae745ede47831abdb1bca73e31fd26cf4478340b130e9
 DIST requests-2.32.3.tar.gz 131218 BLAKE2B 
c36bd80e0544e83b80c001e6bfdde7b8552e65b888d44d781f95d5a6302dd34dfd4368e18dbfeab3a014d7170946c502e3bf3a6dbd027a60a2f0f535c674d75c
 SHA512 
20d413597ff4803a62156ada25ef2e8a5edd0d4dbf7d79cc7fcd88d51a76e019a7dacf41d7c3d546306f37c506ede68f16b9afea57c918db64e702382b1ae420

diff --git a/dev-python/requests/requests-2.32.3.ebuild 
b/dev-python/requests/requests-2.32.3.ebuild
index d4ba48307a30..a5eca5f4c18f 100644
--- a/dev-python/requests/requests-2.32.3.ebuild
+++ b/dev-python/requests/requests-2.32.3.ebuild
@@ -5,7 +5,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
+PYTHON_COMPAT=( python3_{11..14} pypy3_11 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 pypi
@@ -17,6 +17,8 @@ HOMEPAGE="
        https://pypi.org/project/requests/
 "
 
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.32.3-patches.tar.xz";
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~arm64-macos ~x64-macos"
@@ -41,6 +43,14 @@ BDEPEND="
        )
 "
 
+PATCHES=(
+       # https://github.com/psf/requests/pull/6897
+       "${WORKDIR}/${PN}-2.32.3-patches/${PN}-2.32.3-tests.patch"
+       "${WORKDIR}/${PN}-2.32.3-patches/${PN}-2.32.3-tests-regenerate.patch"
+       # https://github.com/psf/requests/pull/6924
+       "${WORKDIR}/${PN}-2.32.3-patches/${PN}-2.32.3-tests-more.patch"
+)
+
 distutils_enable_tests pytest
 
 python_test() {
@@ -53,12 +63,9 @@ python_test() {
                # require IPv4 interface in 10.* range
                tests/test_requests.py::TestTimeout::test_connect_timeout
                tests/test_requests.py::TestTimeout::test_total_timeout_connect
-               # TODO: openssl?
-               tests/test_requests.py::TestRequests::test_pyopenssl_redirect
-               # flask-2
-               
tests/test_requests.py::TestRequests::test_cookie_sent_on_redirect
-               
tests/test_requests.py::TestRequests::test_cookie_removed_on_expire
-               
tests/test_requests.py::TestPreparingURLs::test_redirecting_to_bad_url
+               # As of 2.32.3, with python-3.13.3, despite the patches we've
+               # backported, this still seems to fail. Maybe openssl-3.5?
+               
tests/test_requests.py::TestPreparingURLs::test_different_connection_pool_for_tls_settings_verify_bundle_unexpired_cert
        )
 
        case ${EPYTHON} in

Reply via email to