[gentoo-commits] repo/gentoo:master commit in: dev-python/requests/

[Michał Górny]

commit:     b9cf679e65d9ada1bcd974fe31cb535606f9956d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May  5 10:29:26 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May  5 12:18:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9cf679e

dev-python/requests: Allow idna-3

Closes: https://bugs.gentoo.org/787584
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...-2.25.1-r1.ebuild => requests-2.25.1-r2.ebuild} | 29 ++++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/dev-python/requests/requests-2.25.1-r1.ebuild b/dev-python/requests/requests-2.25.1-r2.ebuild
similarity index 65%
rename from dev-python/requests/requests-2.25.1-r1.ebuild
rename to dev-python/requests/requests-2.25.1-r2.ebuild
index 0ade640f133..d628a9ac03e 100644
--- a/dev-python/requests/requests-2.25.1-r1.ebuild
+++ b/dev-python/requests/requests-2.25.1-r2.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
 	<dev-python/chardet-5[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	<dev-python/idna-3[${PYTHON_USEDEP}]
+	<dev-python/idna-4[${PYTHON_USEDEP}]
 	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
 	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
 "
@@ -38,16 +38,23 @@ BDEPEND="
 distutils_enable_tests pytest
 
 src_prepare() {
+	# allow idna-3
+	sed -i -e '/idna/s:<3:<4:' setup.py || die
+
 	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# Internet
+		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
+		tests/test_requests.py::TestTimeout::test_connect_timeout
+		tests/test_requests.py::TestTimeout::test_total_timeout_connect
+	)
 
-	# strip tests that require some kind of network
-	sed -e 's:test_connect_timeout:_&:' \
-		-e 's:test_total_timeout_connect:_&:' \
-		-i tests/test_requests.py || die
-	# probably pyopenssl version dependent
-	sed -e 's:test_https_warnings:_&:' \
-		-i tests/test_requests.py || die
-	# doctests rely on networking
-	sed -e 's:--doctest-modules::' \
-		-i pytest.ini || die
+	epytest ${deselect[@]/#/--deselect }
 }