From ab58f6c9a0c03bafd2538367da1d3a7bdcd5bd57968c2388f8e0ac909f2982c1 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 3 Feb 2021 22:08:03 +0000 Subject: [PATCH] Accepting request 868971 from home:bnavigator:branches:devel:languages:python - Don't pin idna<3 in the egg-info so that depending packages can install the new idna dropping python2 OBS-URL: https://build.opensuse.org/request/show/868971 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=148 --- python-requests.changes | 6 ++++++ python-requests.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/python-requests.changes b/python-requests.changes index 39c1d51..f1b740c 100644 --- a/python-requests.changes +++ b/python-requests.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 3 14:04:52 UTC 2021 - Ben Greiner + +- Don't pin idna<3 in the egg-info so that depending packages + can install the new idna dropping python2 + ------------------------------------------------------------------- Sat Dec 19 09:57:04 UTC 2020 - Dirk Mueller diff --git a/python-requests.spec b/python-requests.spec index d139003..1ab9d43 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,7 +1,7 @@ # # spec file for package python-requests # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -104,6 +104,11 @@ 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}