pool/python-s3transfer
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 674564 from devel:languages:python:aws

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/674564
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-s3transfer?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2019-02-14 13:34:27 +00:00 committed by Git OBS Bridge
commit a39a6efc98
7 changed files with 61 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hide_py_pckgmgmt.patch
View File

@ -1,34 +1,43 @@
--- setup.py.orig diff -Nru s3transfer-0.2.0.orig/setup.py s3transfer-0.2.0/setup.py
+++ setup.py --- s3transfer-0.2.0.orig/setup.py 2019-02-07 00:14:54.000000000 +0100
@@ -10,15 +10,15 @@ ROOT = os.path.dirname(__file__) +++ 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.]+)['"]''') VERSION_RE = re.compile(r'''__version__ = ['"]([0-9.]+)['"]''')
-requires = [ -requires = [
- 'botocore>=1.3.0,<2.0.0', - 'botocore>=1.12.36,<2.0.0',
-] -]
+#requires = [ +# requires = [
+# 'botocore>=1.3.0,<2.0.0', +# 'botocore>=1.12.36,<2.0.0',
+#] +# ]
-if sys.version_info[0] == 2: -if sys.version_info[0] == 2:
- # concurrent.futures is only in python3, so for - # concurrent.futures is only in python3, so for
- # python2 we need to install the backport. - # python2 we need to install the backport.
- requires.append('futures>=2.2.0,<4.0.0') - requires.append('futures>=2.2.0,<4.0.0')
+#if sys.version_info[0] == 2: +# if sys.version_info[0] == 2:
+# # concurrent.futures is only in python3, so for +# # concurrent.futures is only in python3, so for
+# # python2 we need to install the backport. +# # python2 we need to install the backport.
+# requires.append('futures>=2.2.0,<4.0.0') +# requires.append('futures>=2.2.0,<4.0.0')
def get_version(): def get_version():
@@ -36,7 +36,7 @@ setup( @@ -36,11 +36,11 @@
url='https://github.com/boto/s3transfer', url='https://github.com/boto/s3transfer',
packages=find_packages(exclude=['tests*']), packages=find_packages(exclude=['tests*']),
include_package_data=True, include_package_data=True,
- install_requires=requires, - install_requires=requires,
+# install_requires=requires, - extras_require={
extras_require={ - ':python_version=="2.6" or python_version=="2.7"': [
':python_version=="2.6" or python_version=="2.7"': [ - 'futures>=2.2.0,<4.0.0']
'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',

40
no-bundled-packages.patch
View File

@ -1,34 +1,20 @@
Index: s3transfer-0.1.13/s3transfer/__init__.py 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.1.13.orig/s3transfer/__init__.py +++ s3transfer-0.2.0/s3transfer/__init__.py 2019-02-13 13:29:44.840939556 +0100
+++ s3transfer-0.1.13/s3transfer/__init__.py @@ -134,8 +134,7 @@
@@ -138,7 +138,7 @@ from botocore.compat import six import concurrent.futures
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
from botocore.compat import six from botocore.compat import six
from botocore.exceptions import IncompleteReadError
-from botocore.vendored.requests.packages.urllib3.exceptions import \ -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 import s3transfer.compat
Index: s3transfer-0.1.13/tests/unit/test_s3transfer.py 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.1.13.orig/tests/unit/test_s3transfer.py +++ s3transfer-0.2.0/tests/unit/test_s3transfer.py 2019-02-13 13:30:41.309433514 +0100
+++ s3transfer-0.1.13/tests/unit/test_s3transfer.py @@ -18,7 +18,7 @@
@@ -18,7 +18,7 @@ from tests import unittest
from contextlib import closing from contextlib import closing
import mock import mock

13
python-s3transfer.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Feb 13 12:53:52 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- 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 Wed May 9 09:05:34 UTC 2018 - tchvatal@suse.com

16
python-s3transfer.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package python-s3transfer # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-s3transfer Name: python-s3transfer
Version: 0.1.13 Version: 0.2.0
Release: 0 Release: 0
Summary: Python S3 transfer manager Summary: Python S3 transfer manager
License: Apache-2.0 License: Apache-2.0
@ -26,9 +26,8 @@ Group: Development/Languages/Python
URL: https://github.com/boto/s3transfer URL: https://github.com/boto/s3transfer
Source0: https://files.pythonhosted.org/packages/source/s/s3transfer/s3transfer-%{version}.tar.gz Source0: https://files.pythonhosted.org/packages/source/s/s3transfer/s3transfer-%{version}.tar.gz
Patch0: hide_py_pckgmgmt.patch Patch0: hide_py_pckgmgmt.patch
Patch1: system-requests.patch Patch1: no-bundled-packages.patch
Patch2: no-bundled-packages.patch BuildRequires: %{python_module botocore >= 1.12.36}
BuildRequires: %{python_module botocore >= 1.4.10}
BuildRequires: %{python_module mock} BuildRequires: %{python_module mock}
BuildRequires: %{python_module nose} BuildRequires: %{python_module nose}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
@ -37,7 +36,7 @@ BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildRequires: python2-futures >= 2.2.0 BuildRequires: python2-futures >= 2.2.0
Requires: python-botocore <= 2.0.0 Requires: python-botocore <= 2.0.0
Requires: python-botocore >= 1.4.10 Requires: python-botocore >= 1.12.36
Requires: python-requests Requires: python-requests
Requires: python-urllib3 Requires: python-urllib3
BuildArch: noarch BuildArch: noarch
@ -52,9 +51,8 @@ A transfer manager for Amazon Web Services S3
%prep %prep
%setup -q -n s3transfer-%{version} %setup -q -n s3transfer-%{version}
%patch0 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
# remove integration tests that need running s3 :) # remove integration tests that need running s3 :)
rm -rf tests/integration rm -rf tests/integration

3
s3transfer-0.1.13.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1
size 103335

3
s3transfer-0.2.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021
size 118361

19
system-requests.patch
View File

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