diff options
Diffstat (limited to 'dev-python/requests')
| -rw-r--r-- | dev-python/requests/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch | 41 | ||||
| -rw-r--r-- | dev-python/requests/requests-2.28.1-r1.ebuild (renamed from dev-python/requests/requests-2.28.1.ebuild) | 2 |
3 files changed, 45 insertions, 1 deletions
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest index d10a862ac1b5..de23fb1b66dd 100644 --- a/dev-python/requests/Manifest +++ b/dev-python/requests/Manifest @@ -1,4 +1,5 @@ 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 -EBUILD requests-2.28.1.ebuild 1899 BLAKE2B 75a1e1ab1376ed4d348447cff34a7491a6b5b4f1a50f37f20bcf12ae99632a5c2dc686757111a4994ff2340f08b1127f706d00166cadee6430235054026aef95 SHA512 8cb0cea5dadcb7a8fc4d2eb5765c4af5e281cc4d6aec96e4d66394849207ba70002890019de5dff96cfedba2f2761a042703ad258e95271a221221f3139ecaba +EBUILD requests-2.28.1-r1.ebuild 2007 BLAKE2B 5a9ddfcd88bfd43d0073a86110e6581aca56be915bc45a9e5f1668a7102cdabaee871ae59cdff92d79c9a3ab7878d8f29ee0ee8f56c88702811ec2887c684e96 SHA512 4c40525e45d2ad9fd79d9c4b1794d72455608fea6a07d4501e987099ef4ce3274d91c9af2e41bd07d2c0adc9dfcf3471fb1fe94d1ee66556f1afe8fad26817b6 MISC metadata.xml 770 BLAKE2B a085a3bdbcc34c2297ad7d5a0e811c553aa77f12bba1ee8164cf63af2cd86adcef7b6080c984ea73a417ec690252540a0fc6072ee97b068b70f0f695696fc65c SHA512 de5c6a99ae18955f25895a93911570d41cb458eaaa9dc8b6edd09021c6dff3dda7bc2611d090b933837f83b8a7035769bb275bb844e1ac91b89a088dde3c7222 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 new file mode 100644 index 000000000000..9975072c0c06 --- /dev/null +++ b/dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch @@ -0,0 +1,41 @@ +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.ebuild b/dev-python/requests/requests-2.28.1-r1.ebuild index 2a817e73057f..b317fdb9e931 100644 --- a/dev-python/requests/requests-2.28.1.ebuild +++ b/dev-python/requests/requests-2.28.1-r1.ebuild @@ -44,6 +44,8 @@ BDEPEND=" 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 |