From b9cf679e65d9ada1bcd974fe31cb535606f9956d Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 5 May 2021 12:29:26 +0200 Subject: dev-python/requests: Allow idna-3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/787584 Signed-off-by: Michał Górny --- dev-python/requests/requests-2.25.1-r1.ebuild | 53 ----------------------- dev-python/requests/requests-2.25.1-r2.ebuild | 60 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 53 deletions(-) delete mode 100644 dev-python/requests/requests-2.25.1-r1.ebuild create mode 100644 dev-python/requests/requests-2.25.1-r2.ebuild (limited to 'dev-python/requests') diff --git a/dev-python/requests/requests-2.25.1-r1.ebuild b/dev-python/requests/requests-2.25.1-r1.ebuild deleted file mode 100644 index 0ade640f1331..000000000000 --- a/dev-python/requests/requests-2.25.1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="HTTP library for human beings" -HOMEPAGE="https://requests.readthedocs.io/" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="socks5" - -RDEPEND=" - >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}] - >=dev-python/chardet-3.0.2[${PYTHON_USEDEP}] - =dev-python/idna-2.5[${PYTHON_USEDEP}] - =dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] ) -" - -BDEPEND=" - test? ( - dev-python/pytest-httpbin[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare - - # 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 -} diff --git a/dev-python/requests/requests-2.25.1-r2.ebuild b/dev-python/requests/requests-2.25.1-r2.ebuild new file mode 100644 index 000000000000..d628a9ac03ed --- /dev/null +++ b/dev-python/requests/requests-2.25.1-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +DESCRIPTION="HTTP library for human beings" +HOMEPAGE="https://requests.readthedocs.io/" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="socks5" + +RDEPEND=" + >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}] + >=dev-python/chardet-3.0.2[${PYTHON_USEDEP}] + =dev-python/idna-2.5[${PYTHON_USEDEP}] + =dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] ) +" + +BDEPEND=" + test? ( + dev-python/pytest-httpbin[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] + ) +" + +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 + ) + + epytest ${deselect[@]/#/--deselect } +} -- cgit v1.2.3-65-gdbad