From 615703244c5979f6416a16e9bcbda3677b3feb5b8383ced81f75f878e3e9eade Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 30 May 2023 11:14:21 +0000 Subject: [PATCH] - use vendored urllib3/requests to avoid conflicts with urllib3 2.x and requests OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:aws/python-botocore?expand=0&rev=193 --- python-botocore.changes | 6 ++++++ python-botocore.spec | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/python-botocore.changes b/python-botocore.changes index 885827e..f0bce13 100644 --- a/python-botocore.changes +++ b/python-botocore.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 30 11:13:42 UTC 2023 - Dirk Müller + +- use vendored urllib3/requests to avoid conflicts with + urllib3 2.x and requests + ------------------------------------------------------------------- Tue May 9 11:09:44 UTC 2023 - John Paul Adrian Glaubitz diff --git a/python-botocore.spec b/python-botocore.spec index c86d1f4..8135191 100644 --- a/python-botocore.spec +++ b/python-botocore.spec @@ -40,7 +40,6 @@ BuildRequires: python-rpm-macros Requires: python-requests Requires: (python-jmespath >= 0.7.1 with python-jmespath < 2.0.0) Requires: (python-python-dateutil >= 2.1 with python-python-dateutil < 3.0.0) -Requires: (python-urllib3 >= 1.25.4 with python-urllib3 < 1.27) BuildArch: noarch %if %{with test} BuildRequires: %{python_module botocore = %{version}} @@ -58,12 +57,6 @@ A low-level interface to a growing number of Amazon Web Services. # remove bundled cacert.pem rm botocore/cacert.pem -# remove bundled 3rd party Python modules -rm -r botocore/vendored/ -# fix all imports: -sed -i 's/from botocore\.vendored //' botocore/*.py tests/functional/*.py tests/integration/*.py tests/unit/*.py -sed -i 's/botocore.vendored.requests.model.Response/requests.model.Response/' botocore/endpoint.py -sed -i 's/botocore\.vendored\.//' botocore/*.py tests/functional/*.py tests/integration/*.py tests/unit/*.py %if !%{with test} %build