commit: 574df22d95843facadd8678a39fd038b46cc3293 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Jul 24 20:24:03 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Jul 24 20:24:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574df22d
dev-python/requests: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/requests/Manifest | 2 - .../requests-2.27.1-unpin-charset-normalizer.patch | 25 -------- .../files/requests-2.28.0-unpin-chardet.patch | 37 ----------- .../requests-2.28.0-unpin-charset-normalizer.patch | 31 --------- dev-python/requests/requests-2.27.1-r2.ebuild | 72 --------------------- dev-python/requests/requests-2.28.0-r1.ebuild | 72 --------------------- dev-python/requests/requests-2.28.0-r2.ebuild | 74 ---------------------- 7 files changed, 313 deletions(-) diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest index c6f0bd8fec62..399f9c8adfdf 100644 --- a/dev-python/requests/Manifest +++ b/dev-python/requests/Manifest @@ -1,3 +1 @@ -DIST requests-2.27.1.tar.gz 106758 BLAKE2B a7fed53998fa61b3d03abd254a0cee76450c5b60d76f80aa6b91f32dca1dae5d2c51987b3d3f2138d72c50790e35c36cb03eb5974554ac4eb1a902eff79b5bdd SHA512 e51916abea8125254c5ee72c97e84a73e6981cab09961486873387522d2ce041ee3fe8fa2ff0b9bbe6707eefdc05145e9adcf127bcd999dea127acdfabd5312f -DIST requests-2.28.0.tar.gz 109748 BLAKE2B 1df85b90ab1f6c551e46593dc8640aa0629505c9b395ca2100c6af04435e1360503b215d9796c34fb09122ffd616e1a01ca3574ac4543b4857c76a3dd86f13fe SHA512 111cfd2d0b0267111ccad0a97b33c5e9565812e6e6728b7d5bdbe06c32fae9e637b220bda605d799409e57dc6aaf3bcc66a4a4605cdbccb439367dc492fb836f DIST requests-2.28.1.tar.gz 109805 BLAKE2B 2106be5f9e1d9f1a22de5522b5d72084f91c2849e60e33b89b2411b76cae9b1f7faac34947f69c49480d001e9b77e4dce723ee939d51591882854d510db49b59 SHA512 c123ec07171c2c7c34e4173b97750adfa313b4312d91c0d58e4eb8750361604017e5b370c23ec886d2cbf704f9074ec5ad0fa9c2cd8e6f9521532adafff39d41 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 deleted file mode 100644 index 418cb519ffb6..000000000000 --- a/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch +++ /dev/null @@ -1,25 +0,0 @@ -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-chardet.patch b/dev-python/requests/files/requests-2.28.0-unpin-chardet.patch deleted file mode 100644 index bd0451daaf13..000000000000 --- a/dev-python/requests/files/requests-2.28.0-unpin-chardet.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/psf/requests/pull/6179 - -From 09483bae4f56e4f4c227e2d25ee920c538271feb Mon Sep 17 00:00:00 2001 -From: Wong Hoi Sing Edison <hswon...@pantarei-design.com> -Date: Sun, 26 Jun 2022 12:18:42 +0800 -Subject: [PATCH] Update Dependency with `chardet>=3.0.2,<6` - -https://github.com/chardet/chardet/releases/tag/5.0.0 was released on -2022-06-25 with remove of Python 3.6 support, which also align with our -Python > 3.6 requirement. - -Signed-off-by: Wong Hoi Sing Edison <hswon...@pantarei-design.com> ---- a/requests/__init__.py -+++ b/requests/__init__.py -@@ -75,8 +75,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver - if chardet_version: - major, minor, patch = chardet_version.split(".")[:3] - major, minor, patch = int(major), int(minor), int(patch) -- # chardet_version >= 3.0.2, < 5.0.0 -- assert (3, 0, 2) <= (major, minor, patch) < (5, 0, 0) -+ # chardet_version >= 3.0.2, < 6.0.0 -+ assert (3, 0, 2) <= (major, minor, patch) < (6, 0, 0) - elif charset_normalizer_version: - major, minor, patch = charset_normalizer_version.split(".")[:3] - major, minor, patch = int(major), int(minor), int(patch) ---- a/setup.py -+++ b/setup.py -@@ -123,7 +123,7 @@ def run_tests(self): - extras_require={ - "security": [], - "socks": ["PySocks>=1.5.6, !=1.5.7"], -- "use_chardet_on_py3": ["chardet>=3.0.2,<5"], -+ "use_chardet_on_py3": ["chardet>=3.0.2,<6"], - }, - project_urls={ - "Documentation": "https://requests.readthedocs.io";, - 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 deleted file mode 100644 index d4a4a1596296..000000000000 --- a/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://github.com/psf/requests/pull/6169 -https://bugs.gentoo.org/853247 - -From 9e9cd2a257392988e6fa417361c3085e5b85af85 Mon Sep 17 00:00:00 2001 -From: Lumir Balhar <lbal...@redhat.com> -Date: Mon, 20 Jun 2022 09:32:16 +0200 -Subject: [PATCH] Allow charset normalizer >=2 and <3 - ---- a/setup.py -+++ b/setup.py -@@ -59,7 +59,7 @@ def run_tests(self): - sys.exit() - - requires = [ -- "charset_normalizer~=2.0.0", -+ "charset_normalizer~=2.0", - "idna>=2.5,<4", - "urllib3>=1.21.1,<1.27", - "certifi>=2017.4.17", - ---- a/setup.cfg -+++ b/setup.cfg -@@ -5,7 +5,7 @@ provides-extra = - use_chardet_on_py3 - requires-dist = - certifi>=2017.4.17 -- charset_normalizer~=2.0.0 -+ charset_normalizer~=2.0 - idna>=2.5,<4 - urllib3>=1.21.1,<1.27 - diff --git a/dev-python/requests/requests-2.27.1-r2.ebuild b/dev-python/requests/requests-2.27.1-r2.ebuild deleted file mode 100644 index ecfd2cc3e0ee..000000000000 --- a/dev-python/requests/requests-2.27.1-r2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 7 -- sys-apps/portage dep -EAPI=7 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="HTTP library for human beings" -HOMEPAGE=" - https://requests.readthedocs.io/ - https://github.com/psf/requests/ - https://pypi.org/project/requests/ -" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="socks5" - -RDEPEND=" - >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}] - dev-python/charset_normalizer[${PYTHON_USEDEP}] - <dev-python/idna-4[${PYTHON_USEDEP}] - <dev-python/urllib3-1.27[${PYTHON_USEDEP}] - socks5? ( >=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}] - !alpha? ( !hppa? ( !ia64? ( - dev-python/trustme[${PYTHON_USEDEP}] - ) ) ) - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.27.1-unpin-charset-normalizer.patch -) - -distutils_enable_tests pytest - -python_test() { - 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 - # 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 - ) - - if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then - EPYTEST_DESELECT+=( - tests/test_requests.py::TestRequests::test_https_warnings - ) - fi - - epytest -} diff --git a/dev-python/requests/requests-2.28.0-r1.ebuild b/dev-python/requests/requests-2.28.0-r1.ebuild deleted file mode 100644 index b96762bee446..000000000000 --- a/dev-python/requests/requests-2.28.0-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 7 -- sys-apps/portage dep -EAPI=7 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="HTTP library for human beings" -HOMEPAGE=" - https://requests.readthedocs.io/ - https://github.com/psf/requests/ - https://pypi.org/project/requests/ -" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="socks5" - -RDEPEND=" - >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}] - dev-python/charset_normalizer[${PYTHON_USEDEP}] - <dev-python/idna-4[${PYTHON_USEDEP}] - <dev-python/urllib3-1.27[${PYTHON_USEDEP}] - socks5? ( >=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}] - !alpha? ( !hppa? ( !ia64? ( - dev-python/trustme[${PYTHON_USEDEP}] - ) ) ) - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.28.0-unpin-charset-normalizer.patch -) - -distutils_enable_tests pytest - -python_test() { - 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 - # 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 - ) - - if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then - EPYTEST_DESELECT+=( - tests/test_requests.py::TestRequests::test_https_warnings - ) - fi - - epytest -} diff --git a/dev-python/requests/requests-2.28.0-r2.ebuild b/dev-python/requests/requests-2.28.0-r2.ebuild deleted file mode 100644 index c3c23c38db26..000000000000 --- a/dev-python/requests/requests-2.28.0-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 7 -- sys-apps/portage dep -EAPI=7 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="HTTP library for human beings" -HOMEPAGE=" - https://requests.readthedocs.io/ - https://github.com/psf/requests/ - https://pypi.org/project/requests/ -" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="socks5" - -RDEPEND=" - >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}] - dev-python/charset_normalizer[${PYTHON_USEDEP}] - <dev-python/idna-4[${PYTHON_USEDEP}] - <dev-python/urllib3-1.27[${PYTHON_USEDEP}] - socks5? ( >=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}] - !alpha? ( !hppa? ( !ia64? ( - dev-python/trustme[${PYTHON_USEDEP}] - ) ) ) - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.28.0-unpin-charset-normalizer.patch - "${FILESDIR}"/${PN}-2.28.0-unpin-chardet.patch - "${FILESDIR}"/${PN}-2.28.0-drop-dependency-warnings.patch -) - -distutils_enable_tests pytest - -python_test() { - 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 - # 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 - ) - - if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then - EPYTEST_DESELECT+=( - tests/test_requests.py::TestRequests::test_https_warnings - ) - fi - - epytest -}
