From 5987fa693ef880163ebde423615a177cb5bda20e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 17 Feb 2023 02:06:14 +0000 Subject: gentoo auto-resync : 17:02:2023 - 02:06:14 --- dev-python/requests/Manifest | 3 - ...uests-2.28.1-fix-charsetnormalizer-assert.patch | 41 ------------ dev-python/requests/requests-2.28.1-r1.ebuild | 74 ---------------------- 3 files changed, 118 deletions(-) delete mode 100644 dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch delete mode 100644 dev-python/requests/requests-2.28.1-r1.ebuild (limited to 'dev-python/requests') diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest index 3c9c524e2026..09eaa5af8644 100644 --- a/dev-python/requests/Manifest +++ b/dev-python/requests/Manifest @@ -1,7 +1,4 @@ AUX requests-2.28.0-drop-dependency-warnings.patch 759 BLAKE2B b2cc24d9d3137ad652ab9d8c14a08dd33af7d3f2968433a0f6cb09dda46ee5c98f428e495e5a565d32a142c22afb439e4604e09d2693b945bcceab0475381700 SHA512 2e486d399c311b81522d390ff9eb601fbc31f3ba64c7c3635aa0aa37e959acdba4f0cd4fd87d5ad51e1c50d83057c2f4ea02d9077702d51bda711730ea82e3ce -AUX requests-2.28.1-fix-charsetnormalizer-assert.patch 1345 BLAKE2B ebec5128a84ffc3a8e7197d4fb11e9f0561495675d561749acf777d62681f93e17a3b71ecc9ad3e7671ff56724be7b0ea9a272fbf9747b7b1fb3432ca70c85a7 SHA512 7668b38c43b6e5dd40aaca6b0ffee383569992c66b80c2ab6b9f59fab5dd0fd7bcc8788b9e19a27473b2a7f7b4bd1412638e6316cbbe67130aae428ce905f21c -DIST requests-2.28.1.tar.gz 109805 BLAKE2B 2106be5f9e1d9f1a22de5522b5d72084f91c2849e60e33b89b2411b76cae9b1f7faac34947f69c49480d001e9b77e4dce723ee939d51591882854d510db49b59 SHA512 c123ec07171c2c7c34e4173b97750adfa313b4312d91c0d58e4eb8750361604017e5b370c23ec886d2cbf704f9074ec5ad0fa9c2cd8e6f9521532adafff39d41 DIST requests-2.28.2.tar.gz 108206 BLAKE2B fe6c5d78e6abd36b7134c6e424b5a1c4052eba62b55a01b5842f289b94df3af039a5beba71374db563dd52ce42471d5e3650763b9324533ea6ab3bfd8013379b SHA512 3c4ba19a2bb6ba38a4118cf246db3855401869d54ee7ebd9bee40b435420381fb737d4c69768f2bd97914a30d66233c7058cec51aa629af0dff3b04e6f997a3d -EBUILD requests-2.28.1-r1.ebuild 2007 BLAKE2B 7181fc8be0a42c2ad8084a05cd54a3b92cae0bb459ad29c586bdee07200a33c0e09d84794db3aa28b62f3ce6463611e47d7b35307b34dd0feca8dc872601e780 SHA512 fafd90190e0c52d0a46a434c91eded7fa0ff769309170c1a176cfff1d261983724d0be1bc6f561abb10f03b8e2ba376024e6517dfbf6da1e893b65a03e404a92 EBUILD requests-2.28.2.ebuild 1902 BLAKE2B 5e4eab011a33bf7f71fdbe7fb57a9ce068f77616277c9a5740f8e278c89174a7218243b10d4c05502993ab31400ff64980abb66e042a38bf3e020e100077316d SHA512 43aa4d58590234c569e2bcd6fac77094611380a0a8120df0f3731aef65f055a920917de61e3a4f420ead5434e4f032f9cc13b6c52f501dd594c03031b64e3f0b MISC metadata.xml 824 BLAKE2B 5b803e4eedabb0a90d22d2a96aed0a1e0580e5ee3b0a28b5b93b4e71fd90a85ab72a8de015127a066a584f002d4ea759a168d5fcc4e633e980b08f1bc6dac179 SHA512 01e0ee5ca5343eba3b8259d0e81df9a17f3beb690cc452a77991db6844f961809eb6744c53ac6325197874ca7cd0b872bd8157d7fb23a77cc2c00a83f37fb29a diff --git a/dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch b/dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch deleted file mode 100644 index 9975072c0c06..000000000000 --- a/dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/setup.py b/setup.py -index 23977ed77a..b679181bda 100755 ---- a/setup.py -+++ b/setup.py -@@ -59,7 +59,7 @@ def run_tests(self): - sys.exit() - - requires = [ -- "charset_normalizer>=2,<3", -+ "charset_normalizer>=2,<4", - "idna>=2.5,<4", - "urllib3>=1.21.1,<1.27", - "certifi>=2017.4.17", -diff --git a/setup.cfg b/setup.cfg -index 33af66eb15..0c167eb8c9 100644 ---- 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,<3 -+ charset_normalizer>=2,<4 - idna>=2.5,<4 - urllib3>=1.21.1,<1.27 - -diff --git a/requests/__init__.py b/requests/__init__.py -index 7ac8e297b8..5812c85d8a 100644 ---- a/requests/__init__.py -+++ b/requests/__init__.py -@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver - elif charset_normalizer_version: - major, minor, patch = charset_normalizer_version.split(".")[:3] - major, minor, patch = int(major), int(minor), int(patch) -- # charset_normalizer >= 2.0.0 < 3.0.0 -- assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0) -+ # charset_normalizer >= 2.0.0 < 4.0.0 -+ assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0) - else: - raise Exception("You need either charset_normalizer or chardet installed") - diff --git a/dev-python/requests/requests-2.28.1-r1.ebuild b/dev-python/requests/requests-2.28.1-r1.ebuild deleted file mode 100644 index acd943c80725..000000000000 --- a/dev-python/requests/requests-2.28.1-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2023 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_{9..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 test-rust" - -RDEPEND=" - >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}] - dev-python/charset_normalizer[${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}] - test-rust? ( - dev-python/trustme[${PYTHON_USEDEP}] - ) - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.28.0-drop-dependency-warnings.patch - # https://github.com/psf/requests/pull/6261 - "${FILESDIR}"/${PN}-2.28.1-fix-charsetnormalizer-assert.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 -} -- cgit v1.2.3