diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch index 6eee381..71db1cf 100644 --- a/hide_py_pckgmgmt.patch +++ b/hide_py_pckgmgmt.patch @@ -1,34 +1,43 @@ ---- setup.py.orig -+++ setup.py -@@ -10,15 +10,15 @@ ROOT = os.path.dirname(__file__) +diff -Nru s3transfer-0.2.0.orig/setup.py s3transfer-0.2.0/setup.py +--- s3transfer-0.2.0.orig/setup.py 2019-02-07 00:14:54.000000000 +0100 ++++ s3transfer-0.2.0/setup.py 2019-02-13 13:26:03.879007918 +0100 +@@ -10,15 +10,15 @@ VERSION_RE = re.compile(r'''__version__ = ['"]([0-9.]+)['"]''') -requires = [ -- 'botocore>=1.3.0,<2.0.0', +- 'botocore>=1.12.36,<2.0.0', -] -+#requires = [ -+# 'botocore>=1.3.0,<2.0.0', -+#] ++# requires = [ ++# 'botocore>=1.12.36,<2.0.0', ++# ] -if sys.version_info[0] == 2: - # concurrent.futures is only in python3, so for - # python2 we need to install the backport. - requires.append('futures>=2.2.0,<4.0.0') -+#if sys.version_info[0] == 2: -+# # concurrent.futures is only in python3, so for -+# # python2 we need to install the backport. -+# requires.append('futures>=2.2.0,<4.0.0') ++# if sys.version_info[0] == 2: ++# # concurrent.futures is only in python3, so for ++# # python2 we need to install the backport. ++# requires.append('futures>=2.2.0,<4.0.0') def get_version(): -@@ -36,7 +36,7 @@ setup( +@@ -36,11 +36,11 @@ url='https://github.com/boto/s3transfer', packages=find_packages(exclude=['tests*']), include_package_data=True, - install_requires=requires, -+# install_requires=requires, - extras_require={ - ':python_version=="2.6" or python_version=="2.7"': [ - 'futures>=2.2.0,<4.0.0'] +- extras_require={ +- ':python_version=="2.6" or python_version=="2.7"': [ +- 'futures>=2.2.0,<4.0.0'] +- }, ++ # install_requires=requires, ++ # extras_require={ ++ # ':python_version=="2.6" or python_version=="2.7"': [ ++ # 'futures>=2.2.0,<4.0.0'] ++ # }, + license="Apache License 2.0", + classifiers=( + 'Development Status :: 3 - Alpha', diff --git a/no-bundled-packages.patch b/no-bundled-packages.patch index fadf9c8..e52a25a 100644 --- a/no-bundled-packages.patch +++ b/no-bundled-packages.patch @@ -1,34 +1,20 @@ -Index: s3transfer-0.1.13/s3transfer/__init__.py -=================================================================== ---- s3transfer-0.1.13.orig/s3transfer/__init__.py -+++ s3transfer-0.1.13/s3transfer/__init__.py -@@ -138,7 +138,7 @@ from botocore.compat import six - try: - from botocore.vendored.requests.packages.urllib3.exceptions import ReadTimeoutError - except ImportError: -- from requests.packages.urllib3.exceptions import ReadTimeoutError -+ from urllib3.exceptions import ReadTimeoutError - - from botocore.exceptions import IncompleteReadError - -Index: s3transfer-0.1.13/s3transfer/download.py -=================================================================== ---- s3transfer-0.1.13.orig/s3transfer/download.py -+++ s3transfer-0.1.13/s3transfer/download.py -@@ -20,7 +20,7 @@ import heapq +diff -Nru s3transfer-0.2.0.orig/s3transfer/__init__.py s3transfer-0.2.0/s3transfer/__init__.py +--- s3transfer-0.2.0.orig/s3transfer/__init__.py 2019-02-07 00:14:54.000000000 +0100 ++++ s3transfer-0.2.0/s3transfer/__init__.py 2019-02-13 13:29:44.840939556 +0100 +@@ -134,8 +134,7 @@ + import concurrent.futures from botocore.compat import six - from botocore.exceptions import IncompleteReadError -from botocore.vendored.requests.packages.urllib3.exceptions import \ -+from urllib3.exceptions import \ - ReadTimeoutError +- ReadTimeoutError ++from urllib3.exceptions import ReadTimeoutError + from botocore.exceptions import IncompleteReadError - from s3transfer.compat import SOCKET_ERROR -Index: s3transfer-0.1.13/tests/unit/test_s3transfer.py -=================================================================== ---- s3transfer-0.1.13.orig/tests/unit/test_s3transfer.py -+++ s3transfer-0.1.13/tests/unit/test_s3transfer.py -@@ -18,7 +18,7 @@ from tests import unittest + import s3transfer.compat +diff -Nru s3transfer-0.2.0.orig/tests/unit/test_s3transfer.py s3transfer-0.2.0/tests/unit/test_s3transfer.py +--- s3transfer-0.2.0.orig/tests/unit/test_s3transfer.py 2019-02-07 00:14:54.000000000 +0100 ++++ s3transfer-0.2.0/tests/unit/test_s3transfer.py 2019-02-13 13:30:41.309433514 +0100 +@@ -18,7 +18,7 @@ from contextlib import closing import mock diff --git a/python-s3transfer.changes b/python-s3transfer.changes index 1cff543..6886863 100644 --- a/python-s3transfer.changes +++ b/python-s3transfer.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Feb 13 12:53:52 UTC 2019 - John Paul Adrian Glaubitz + +- Update to version 0.2.0 + * feature:``ProcessPoolDownloader``: Add ``ProcessPoolDownloader`` class + to speed up download throughput by using processes instead of threads. +- Drop obsolete patch + + system-requests.patch +- Refresh patches for new version + + hide_py_pckgmgmt.patch + + no-bundled-packages.patch +- Update Requires in spec file from setup.py + ------------------------------------------------------------------- Wed May 9 09:05:34 UTC 2018 - tchvatal@suse.com diff --git a/python-s3transfer.spec b/python-s3transfer.spec index 67a0702..7d034b6 100644 --- a/python-s3transfer.spec +++ b/python-s3transfer.spec @@ -1,7 +1,7 @@ # # spec file for package python-s3transfer # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,13 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-s3transfer -Version: 0.1.13 +Version: 0.2.0 Release: 0 Summary: Python S3 transfer manager License: Apache-2.0 @@ -26,9 +26,8 @@ Group: Development/Languages/Python URL: https://github.com/boto/s3transfer Source0: https://files.pythonhosted.org/packages/source/s/s3transfer/s3transfer-%{version}.tar.gz Patch0: hide_py_pckgmgmt.patch -Patch1: system-requests.patch -Patch2: no-bundled-packages.patch -BuildRequires: %{python_module botocore >= 1.4.10} +Patch1: no-bundled-packages.patch +BuildRequires: %{python_module botocore >= 1.12.36} BuildRequires: %{python_module mock} BuildRequires: %{python_module nose} BuildRequires: %{python_module setuptools} @@ -37,7 +36,7 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python2-futures >= 2.2.0 Requires: python-botocore <= 2.0.0 -Requires: python-botocore >= 1.4.10 +Requires: python-botocore >= 1.12.36 Requires: python-requests Requires: python-urllib3 BuildArch: noarch @@ -52,9 +51,8 @@ A transfer manager for Amazon Web Services S3 %prep %setup -q -n s3transfer-%{version} -%patch0 +%patch0 -p1 %patch1 -p1 -%patch2 -p1 # remove integration tests that need running s3 :) rm -rf tests/integration diff --git a/s3transfer-0.1.13.tar.gz b/s3transfer-0.1.13.tar.gz deleted file mode 100644 index 88cdd1d..0000000 --- a/s3transfer-0.1.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1 -size 103335 diff --git a/s3transfer-0.2.0.tar.gz b/s3transfer-0.2.0.tar.gz new file mode 100644 index 0000000..b4638e9 --- /dev/null +++ b/s3transfer-0.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021 +size 118361 diff --git a/system-requests.patch b/system-requests.patch deleted file mode 100644 index 6db93be..0000000 --- a/system-requests.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: s3transfer-0.1.13/s3transfer/__init__.py -=================================================================== ---- s3transfer-0.1.13.orig/s3transfer/__init__.py -+++ s3transfer-0.1.13/s3transfer/__init__.py -@@ -134,8 +134,12 @@ import string - import concurrent.futures - - from botocore.compat import six --from botocore.vendored.requests.packages.urllib3.exceptions import \ -- ReadTimeoutError -+ -+try: -+ from botocore.vendored.requests.packages.urllib3.exceptions import ReadTimeoutError -+except ImportError: -+ from requests.packages.urllib3.exceptions import ReadTimeoutError -+ - from botocore.exceptions import IncompleteReadError - - import s3transfer.compat