pool/python-requests
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- add 5711.patch from upstream instead to remove idna<3 pin

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=149
This commit is contained in:
Dirk Mueller 2021-02-04 10:32:38 +00:00 committed by Git OBS Bridge
parent ab58f6c9a0
commit 2799a9caa2
3 changed files with 57 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
5711.patch Normal file
View File

@ -0,0 +1,50 @@
From 9484e13c7da927119fe82794bb5571cec144b6d7 Mon Sep 17 00:00:00 2001
From: Naor Livne <naorlivne@gmail.com>
Date: Fri, 1 Jan 2021 14:31:14 +0200
Subject: [PATCH 1/2] bump idna has version 3.0 was released
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 7ba4b2a25f..f265384236 100755
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ def run_tests(self):
requires = [
'chardet>=3.0.2,<5',
- 'idna>=2.5,<3',
+ 'idna>=2.5,<4',
'urllib3>=1.21.1,<1.27',
'certifi>=2017.4.17'
From d3e00a4958af046879f24de365d5589d861ea6ef Mon Sep 17 00:00:00 2001
From: Naor Livne <naorlivne@gmail.com>
Date: Tue, 5 Jan 2021 16:31:15 +0200
Subject: [PATCH 2/2] Update setup.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Mickaël Schoentgen <contact@tiger-222.fr>
---
setup.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index f265384236..5ce59e621d 100755
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,8 @@ def run_tests(self):
requires = [
'chardet>=3.0.2,<5',
- 'idna>=2.5,<4',
+ 'idna>=2.5,<3 ; python_version < "3"',
+ 'idna>=2.5,<4 ; python_version >= "3"',
'urllib3>=1.21.1,<1.27',
'certifi>=2017.4.17'

5
python-requests.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 4 10:32:14 UTC 2021 - Dirk Müller <dmueller@suse.com>
- add 5711.patch from upstream instead to remove idna<3 pin
-------------------------------------------------------------------
Wed Feb 3 14:04:52 UTC 2021 - Ben Greiner <code@bnavigator.de>

7
python-requests.spec
View File

@ -35,6 +35,8 @@ URL: http://python-requests.org/
Source: https://files.pythonhosted.org/packages/source/r/requests/requests-%{version}.tar.gz
# PATCH-FIX-SUSE: do not hardcode versions in setup.py/requirements
Patch0: requests-no-hardcoded-version.patch
# PATCH-FIX-UPSTREAM
Patch1: https://patch-diff.githubusercontent.com/raw/psf/requests/pull/5711.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@ -104,11 +106,6 @@ sed -i "s#\(httpbin.*\), 'never'#\1#" tests/test_requests.py
%install
%if !%{with test}
%python_install
%{python_expand # don't pin to idna<3 for python3, because many package installers check this and fail with newer idna
if [ ! 0%{$python_version_nodots} -lt 30 ]; then
sed -i -E 's/idna<3,?/idna/' %{buildroot}%{$python_sitelib}/requests-%{version}*-info/requires.txt
fi
}
# check that urllib3 is not installed
test ! -e %{buildroot}%{python3_sitelib}/requests/packages/urllib3
%python_expand %fdupes %{buildroot}%{$python_sitelib}