gentoo resync : 05.12.2021

3 files changed, 51 insertions, 6 deletions

diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 62007d56687c..e40c153480ce 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,4 +1,5 @@
 AUX requests-2.26.0-test.patch 1328 BLAKE2B 4f9e66505a4acfe7b4bd62c6c95c28fc01eb9fd7d09e151aef7da27fb105d5038ddc99c3d838c7a166d769223ff18ed0517e961ffa345459b4350ccdfa21b50d SHA512 89a4cf8d03f2bf8308cba1a6ed97b4f2340a2b9512636f2244f5f9cb6bae00300e73b58bbe53fad1d9c9e4e2e8e3298fa6741190869cfd4799e3be9bc56b0bc0
+AUX requests-2.26.0-trustme-dep.patch 1134 BLAKE2B c432d6edf75d37e62d529ce06ea5dc0ba88593f7c7b40900388bbfc2b8d8503870fe4226c256d36de9ca42f3b638ed5ea11176cb22ffe2e5d4828418e21619f6 SHA512 9f9383836d0bf5dd4f86ccf7e6f5d6d8f4601a68f42465958f431a8cc471d74584f616d1145fe21ae26c6b182a95758593a947b3dca7ad6fcd5f868421e182f2
 DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
-EBUILD requests-2.26.0.ebuild 1603 BLAKE2B f02390a2ffdc36395ddcc7294e2cf04dbf1a5879ccd5397b7e42666cee4c7aa155ac1139715e6c3d635b3c8498cfb708b3bc38f89c083c908799a265a8a89159 SHA512 818b30044b8cdd909659548349589e96553177905e12ae678d1baa25bd7cf2834a25108aa42aafe4c8404f42597b342dd7de4d5534cba27475f00d5888d2eae2
+EBUILD requests-2.26.0.ebuild 1806 BLAKE2B 986e2e35b139c752321d3d3034c8fa474531abafa2d3855f9ab3be0e6f86fab99565b2e98fc17fe82252a65e892bdda986373ffc63043953ca3eaf0b29623eb2 SHA512 c64c06742ba604d261512b92082984b6b1ad6534cc4de96f71efdbb7407ff94fbe6b42c303d6450d6f402e52576e55d515d60e148b4d7ef2e9a358f7f7a31a66
 MISC metadata.xml 770 BLAKE2B a085a3bdbcc34c2297ad7d5a0e811c553aa77f12bba1ee8164cf63af2cd86adcef7b6080c984ea73a417ec690252540a0fc6072ee97b068b70f0f695696fc65c SHA512 de5c6a99ae18955f25895a93911570d41cb458eaaa9dc8b6edd09021c6dff3dda7bc2611d090b933837f83b8a7035769bb275bb844e1ac91b89a088dde3c7222
diff --git a/dev-python/requests/files/requests-2.26.0-trustme-dep.patch b/dev-python/requests/files/requests-2.26.0-trustme-dep.patch
new file mode 100644
index 000000000000..5542bb68da90
--- /dev/null
+++ b/dev-python/requests/files/requests-2.26.0-trustme-dep.patch
@@ -0,0 +1,35 @@
+From 55da533a87afe188282b7f8dfbadeb30c21743d8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 27 Nov 2021 10:33:35 +0100
+Subject: [PATCH] Defer the trustme import until inside the fixture
+
+Move the trustme import from global scope into the nosan_server fixture
+in order to make it possible to deselect the test via command-line
+when trustme is not available.
+---
+ tests/conftest.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 099462cf52..4f9b2641b4 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -13,7 +13,6 @@
+ 
+ import pytest
+ from requests.compat import urljoin
+-import trustme
+ 
+ 
+ def prepare_url(value):
+@@ -38,6 +37,10 @@ def httpbin_secure(httpbin_secure):
+ 
+ @pytest.fixture
+ def nosan_server(tmp_path_factory):
++    # delay importing until the fixture in order to make it possible
++    # to deselect the test via command-line when trustme is not available
++    import trustme
++
+     tmpdir = tmp_path_factory.mktemp("certs")
+     ca = trustme.CA()
+     # only commonName, no subjectAltName
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 911ddfa1be0d..82d85a0a8333 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -30,8 +30,10 @@ BDEPEND="
 	test? (
 		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
 		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+		!alpha? ( !hppa? ( !ia64? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		) ) )
 	)
 "
 
@@ -39,21 +41,28 @@ distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/${P}-test.patch
+	"${FILESDIR}"/${P}-trustme-dep.patch
 )
 
 python_test() {
-	local deselect=(
-		# Internet
+	local EPYTEST_DESELECT=(
+		# Internet (doctests)
 		requests/__init__.py::requests
 		requests/api.py::requests.api.request
 		requests/models.py::requests.models.PreparedRequest
 		requests/sessions.py::requests.sessions.Session
-		tests/test_requests.py::TestRequests::test_https_warnings
+		# 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
 	)
 
-	epytest ${deselect[@]/#/--deselect }
+	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_requests.py::TestRequests::test_https_warnings
+		)
+	fi
+
+	epytest
 }