- 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
This commit is contained in:
Dirk Mueller 2023-05-30 11:14:21 +00:00 committed by Git OBS Bridge
parent d2b5be3780
commit 615703244c
2 changed files with 6 additions and 7 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 30 11:13:42 UTC 2023 - Dirk Müller <dmueller@suse.com>
- 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 <adrian.glaubitz@suse.com>

View File

@ -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