diff --git a/no-bundled-packages.patch b/no-bundled-packages.patch deleted file mode 100644 index 9f7f929..0000000 --- a/no-bundled-packages.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru s3transfer-0.6.0.orig/s3transfer/__init__.py s3transfer-0.6.0/s3transfer/__init__.py ---- s3transfer-0.6.0.orig/s3transfer/__init__.py 2022-05-31 20:37:19.000000000 +0200 -+++ s3transfer-0.6.0/s3transfer/__init__.py 2022-06-03 13:37:36.897087996 +0200 -@@ -136,7 +136,7 @@ - - from botocore.compat import six # noqa: F401 - from botocore.exceptions import IncompleteReadError --from botocore.vendored.requests.packages.urllib3.exceptions import ( -+from urllib3.exceptions import ( - ReadTimeoutError, - ) - diff --git a/python-s3transfer.changes b/python-s3transfer.changes index c763cd0..2ff8edb 100644 --- a/python-s3transfer.changes +++ b/python-s3transfer.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 30 11:20:14 UTC 2023 - Dirk Müller + +- drop no-bundled-packages.patch to allow unpinning urllib3 + ------------------------------------------------------------------- Wed May 17 05:54:20 UTC 2023 - Dirk Müller diff --git a/python-s3transfer.spec b/python-s3transfer.spec index 2efb17f..b3906c5 100644 --- a/python-s3transfer.spec +++ b/python-s3transfer.spec @@ -26,17 +26,14 @@ License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/boto/s3transfer Source0: https://files.pythonhosted.org/packages/source/s/s3transfer/s3transfer-%{version}.tar.gz -Patch1: no-bundled-packages.patch BuildRequires: %{python_module botocore >= 1.12.36} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module urllib3 with %python-urllib3 < 2} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-botocore <= 2.0.0 Requires: python-botocore >= 1.12.36 Requires: python-requests -Requires: python-urllib3 < 2 BuildArch: noarch %python_subpackages @@ -46,7 +43,6 @@ A transfer manager for Amazon Web Services S3 %prep %setup -q -n s3transfer-%{version} -%patch1 -p1 # remove integration tests that need running s3 rm -rf tests/integration