From 74ce75e010567e85ed085f78df9b92367ba12fb1 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 30 Mar 2026 08:15:27 +0200 Subject: [PATCH] Update to 2.33.1 (rhbz#2451396) --- .gitignore | 2 + 0001-Increase-chardet-upper-limit-to-7.patch | 39 --------------- python-requests.spec | 7 +-- sources | 2 +- system-certs.patch | 51 ++++++++------------ 5 files changed, 25 insertions(+), 76 deletions(-) delete mode 100644 0001-Increase-chardet-upper-limit-to-7.patch diff --git a/.gitignore b/.gitignore index 2a551fe..4ffe62f 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,5 @@ /requests-v2.32.3.tar.gz /requests-v2.32.4.tar.gz /requests-v2.32.5.tar.gz +/requests-v2.33.0.tar.gz +/requests-v2.33.1.tar.gz diff --git a/0001-Increase-chardet-upper-limit-to-7.patch b/0001-Increase-chardet-upper-limit-to-7.patch deleted file mode 100644 index 1be971b..0000000 --- a/0001-Increase-chardet-upper-limit-to-7.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bbce29105ed06418e58f4f33c6adff7aea1ca400 Mon Sep 17 00:00:00 2001 -From: Amin Vakil -Date: Sun, 22 Feb 2026 19:37:16 +0330 -Subject: [PATCH] Increase chardet upper limit to 7 - ---- - setup.py | 2 +- - src/requests/__init__.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index ff65d391..3c55e181 100755 ---- a/setup.py -+++ b/setup.py -@@ -98,7 +98,7 @@ setup( - extras_require={ - "security": [], - "socks": ["PySocks>=1.5.6, !=1.5.7"], -- "use_chardet_on_py3": ["chardet>=3.0.2,<6"], -+ "use_chardet_on_py3": ["chardet>=3.0.2,<7"], - }, - project_urls={ - "Documentation": "https://requests.readthedocs.io", -diff --git a/src/requests/__init__.py b/src/requests/__init__.py -index 051cda13..9a80c625 100644 ---- a/src/requests/__init__.py -+++ b/src/requests/__init__.py -@@ -76,7 +76,7 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver - major, minor, patch = chardet_version.split(".")[:3] - major, minor, patch = int(major), int(minor), int(patch) - # chardet_version >= 3.0.2, < 6.0.0 -- assert (3, 0, 2) <= (major, minor, patch) < (6, 0, 0) -+ assert (3, 0, 2) <= (major, minor, patch) < (7, 0, 0) - elif charset_normalizer_version: - major, minor, patch = charset_normalizer_version.split(".")[:3] - major, minor, patch = int(major), int(minor), int(patch) --- -2.53.0 - diff --git a/python-requests.spec b/python-requests.spec index 4797e8a..0978d1e 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ %bcond extradeps %{undefined rhel} Name: python-requests -Version: 2.32.5 +Version: 2.33.1 Release: %autorelease Summary: HTTP library, written in Python, for human beings @@ -25,11 +25,6 @@ Patch: system-certs.patch # This change is backported also into RHEL 9.4 (via CS) Patch: support_IPv6_CIDR_in_no_proxy.patch -# Increase chardet upper limit to 7 -# https://github.com/psf/requests/commit/4bd79e397304d46dfccd76f36c07f66c0295ff82 -# Backported to v2.32.5 -Patch: 0001-Increase-chardet-upper-limit-to-7.patch - BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel %if %{with tests} diff --git a/sources b/sources index e2adddc..741c49d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.32.5.tar.gz) = ca73dcaec9a12ecd7d16d5f30a9213fc520b9b9d659bd6d35e6f05f7b823e1bf6209c7ae48d5e301974794d92dbc8facb937ce99e22180b28dd80f6f2afa13ae +SHA512 (requests-v2.33.1.tar.gz) = 70a41066d3e70060b6fc06bdad9573c806459db1467f8faae7821cba837233aebf0b1eb318d827ead39f001e3a129fe3f51a5856f670926c4281b0a3b11e9245 diff --git a/system-certs.patch b/system-certs.patch index 42b8213..2006d1b 100644 --- a/system-certs.patch +++ b/system-certs.patch @@ -1,44 +1,34 @@ -From e0ce6c20989a205489df47f8abaff5369ed588ca Mon Sep 17 00:00:00 2001 +From dc053415622f4c7fa4fdee2576b640fc105cbf0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= -Date: Thu, 30 May 2024 11:10:29 +0200 +Date: Mon, 30 Mar 2026 08:08:14 +0200 Subject: [PATCH] system certs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit -Co-authored-by: Lumir Balhar +Co-authored-by: Lumír Balhar --- - setup.cfg | 1 - - setup.py | 1 - + pyproject.toml | 1 - src/requests/certs.py | 8 +++++++- - 3 files changed, 7 insertions(+), 3 deletions(-) + 2 files changed, 7 insertions(+), 2 deletions(-) -diff --git a/setup.cfg b/setup.cfg -index 8d44e0e..fa10a53 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -4,7 +4,6 @@ provides-extra = - socks - use_chardet_on_py3 - requires-dist = -- certifi>=2017.4.17 - charset_normalizer>=2,<4 - idna>=2.5,<4 - urllib3>=1.21.1,<3 -diff --git a/setup.py b/setup.py -index 7d9b52b..17da826 100755 ---- a/setup.py -+++ b/setup.py -@@ -37,7 +37,6 @@ requires = [ +diff --git a/pyproject.toml b/pyproject.toml +index dcde263..ac81c96 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -19,7 +19,6 @@ dependencies = [ "charset_normalizer>=2,<4", "idna>=2.5,<4", - "urllib3>=1.21.1,<3", -- "certifi>=2017.4.17", + "urllib3>=1.26,<3", +- "certifi>=2023.5.7" ] - test_requirements = [ - "pytest-httpbin==2.1.0", + dynamic = ["version"] + diff --git a/src/requests/certs.py b/src/requests/certs.py -index be422c3..9aee713 100644 +index 7987ff5..751c363 100644 --- a/src/requests/certs.py +++ b/src/requests/certs.py -@@ -10,8 +10,14 @@ only one — the one from the certifi package. +@@ -9,9 +9,15 @@ only one — the one from the certifi package. If you are packaging Requests, e.g., for a Linux distribution or a managed environment, you can change the definition of where() to return a separately packaged CA bundle. @@ -46,6 +36,7 @@ index be422c3..9aee713 100644 +This Fedora-patched package returns "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" provided +by the ca-certificates RPM package. """ + -from certifi import where + +def where(): @@ -55,5 +46,5 @@ index be422c3..9aee713 100644 if __name__ == "__main__": print(where()) -- -2.50.0 +2.53.0