From 3c5c250dc66a17a899bb06f2dec291397df975f3 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Sat, 5 Nov 2022 15:16:16 +0800 Subject: [PATCH] Fix the mailman build error caused by the python-chardet update. --- Update-dependency-with-chardet.patch | 41 ++++++++++++++++++++++++++++ python-requests.spec | 6 +++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 Update-dependency-with-chardet.patch diff --git a/Update-dependency-with-chardet.patch b/Update-dependency-with-chardet.patch new file mode 100644 index 0000000..78625b3 --- /dev/null +++ b/Update-dependency-with-chardet.patch @@ -0,0 +1,41 @@ +From 8cb31a4ce6b165795d049cbb278e20b14d53ed02 Mon Sep 17 00:00:00 2001 +From: starlet-dx <15929766099@163.com> +Date: Sat, 5 Nov 2022 14:53:01 +0800 +Subject: [PATCH 1/1] Update Dependency with 'chardet>=3.0.2,<6' + +--- + requests/__init__.py | 4 ++-- + setup.py | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/requests/__init__.py b/requests/__init__.py +index 0ac7713..0708d11 100644 +--- a/requests/__init__.py ++++ b/requests/__init__.py +@@ -74,8 +74,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) +diff --git a/setup.py b/setup.py +index de86a91..5974e66 100755 +--- a/setup.py ++++ b/setup.py +@@ -103,7 +103,7 @@ setup( + 'security': [], + 'socks': ['PySocks>=1.5.6, !=1.5.7'], + 'socks:sys_platform == "win32" and python_version == "2.7"': ['win_inet_pton'], +- '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', +-- +2.30.0 + diff --git a/python-requests.spec b/python-requests.spec index 7b75ef4..1cca78d 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -2,7 +2,7 @@ Name: python-requests Version: 2.26.0 -Release: 6 +Release: 7 Summary: Python HTTP Library License: ASL 2.0 URL: http://python-requests.org/ @@ -12,6 +12,7 @@ Patch1: requests-2.12.4-tests_nonet.patch Patch2: requests-2.20.0-no-py2-httpbin.patch Patch3: patch-requests-certs.py-to-use-the-system-CA-bundle.patch Patch4: Remove-tests-that-use-the-tarpit.patch +Patch5: Update-dependency-with-chardet.patch BuildArch: noarch @@ -95,6 +96,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %doc HISTORY.md README.md %changelog +* Sat Nov 05 2022 yaoxin - 2.26.0-7 +- Fix the mailman build error caused by the python-chardet update. + * Tue Oct 25 2022 wangkerong - 2.26.0-6 - rebuild for next release -- Gitee