From 1170117ec6eacde604fc0ca9717c64f55db22f5fafe54c5728f8f32be7868e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 Mar 2020 06:55:38 +0000 Subject: [PATCH 1/2] Accepting request 779822 from home:scarabeus_iv:branches:devel:languages:python:aws - Update to 0.3.3: * bugfix:dependency: Updated botocore version range - Drop patch hide_py_pckgmgmt.patch it should not be needed * we updated setuptools on SLE 12 to handle complex dependencies - Use pytest for test execution: * the nose is used by upstream but really not needed and it will get borked with python 3.10 OBS-URL: https://build.opensuse.org/request/show/779822 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:aws/python-s3transfer?expand=0&rev=14 --- hide_py_pckgmgmt.patch | 43 --------------------------------------- python-s3transfer.changes | 11 ++++++++++ python-s3transfer.spec | 13 ++++-------- s3transfer-0.3.2.tar.gz | 3 --- s3transfer-0.3.3.tar.gz | 3 +++ 5 files changed, 18 insertions(+), 55 deletions(-) delete mode 100644 hide_py_pckgmgmt.patch delete mode 100644 s3transfer-0.3.2.tar.gz create mode 100644 s3transfer-0.3.3.tar.gz diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch deleted file mode 100644 index f436d3c..0000000 --- a/hide_py_pckgmgmt.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Nru s3transfer-0.3.2.orig/setup.py s3transfer-0.3.2/setup.py ---- s3transfer-0.3.2.orig/setup.py 2020-01-23 20:10:38.000000000 +0100 -+++ s3transfer-0.3.2/setup.py 2020-01-27 17:03:58.370465807 +0100 -@@ -10,15 +10,15 @@ - VERSION_RE = re.compile(r'''__version__ = ['"]([0-9.]+)['"]''') - - --requires = [ -- 'botocore>=1.12.36,<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') - - - def get_version(): -@@ -36,11 +36,11 @@ - url='https://github.com/boto/s3transfer', - packages=find_packages(exclude=['tests*']), - include_package_data=True, -- install_requires=requires, -- extras_require={ -- ':python_version=="2.7"': [ -- 'futures>=2.2.0,<4.0.0'] -- }, -+ # install_requires=requires, -+ # extras_require={ -+ # ':python_version=="2.7"': [ -+ # 'futures>=2.2.0,<4.0.0'] -+ # }, - license="Apache License 2.0", - classifiers=( - 'Development Status :: 3 - Alpha', diff --git a/python-s3transfer.changes b/python-s3transfer.changes index 11ca62c..6eb703d 100644 --- a/python-s3transfer.changes +++ b/python-s3transfer.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Feb 27 08:21:19 UTC 2020 - Tomáš Chvátal + +- Update to 0.3.3: + * bugfix:dependency: Updated botocore version range +- Drop patch hide_py_pckgmgmt.patch it should not be needed + * we updated setuptools on SLE 12 to handle complex dependencies +- Use pytest for test execution: + * the nose is used by upstream but really not needed and it + will get borked with python 3.10 + ------------------------------------------------------------------- Mon Jan 27 16:10:36 UTC 2020 - John Paul Adrian Glaubitz diff --git a/python-s3transfer.spec b/python-s3transfer.spec index 42dac1d..728b506 100644 --- a/python-s3transfer.spec +++ b/python-s3transfer.spec @@ -18,18 +18,17 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-s3transfer -Version: 0.3.2 +Version: 0.3.3 Release: 0 Summary: Python S3 transfer manager 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 -Patch0: hide_py_pckgmgmt.patch Patch1: no-bundled-packages.patch BuildRequires: %{python_module botocore >= 1.12.36} BuildRequires: %{python_module mock} -BuildRequires: %{python_module nose} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module urllib3} BuildRequires: fdupes @@ -51,9 +50,8 @@ A transfer manager for Amazon Web Services S3 %prep %setup -q -n s3transfer-%{version} -%patch0 -p1 %patch1 -p1 -# remove integration tests that need running s3 :) +# remove integration tests that need running s3 rm -rf tests/integration %build @@ -64,10 +62,7 @@ rm -rf tests/integration %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -# on 32bit the tests fail on OOM and various other funny things -%ifarch x86_64 -%python_expand nosetests-%{$python_bin_suffix} -%endif +%pytest %files %{python_files} %license LICENSE.txt diff --git a/s3transfer-0.3.2.tar.gz b/s3transfer-0.3.2.tar.gz deleted file mode 100644 index 3490533..0000000 --- a/s3transfer-0.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4924e10451cc37901945806423d16c2c2040a6530645a614ed87e995ccec764c -size 118876 diff --git a/s3transfer-0.3.3.tar.gz b/s3transfer-0.3.3.tar.gz new file mode 100644 index 0000000..a653f6c --- /dev/null +++ b/s3transfer-0.3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:921a37e2aefc64145e7b73d50c71bb4f26f46e4c9f414dc648c6245ff92cf7db +size 118872 From 979c3285493fe3442b027287a92be83a96b6d04062cb5bb1ffdcb65c4555a33c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 10 Mar 2020 09:45:57 +0000 Subject: [PATCH 2/2] - Skip test failing on python 3.8, it is race condition that needs to be fixed in tests OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:aws/python-s3transfer?expand=0&rev=15 --- python-s3transfer.changes | 6 ++++++ python-s3transfer.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/python-s3transfer.changes b/python-s3transfer.changes index 6eb703d..fac2e7b 100644 --- a/python-s3transfer.changes +++ b/python-s3transfer.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 10 09:45:34 UTC 2020 - Tomáš Chvátal + +- Skip test failing on python 3.8, it is race condition that needs + to be fixed in tests + ------------------------------------------------------------------- Thu Feb 27 08:21:19 UTC 2020 - Tomáš Chvátal diff --git a/python-s3transfer.spec b/python-s3transfer.spec index 728b506..5d255b6 100644 --- a/python-s3transfer.spec +++ b/python-s3transfer.spec @@ -62,7 +62,8 @@ rm -rf tests/integration %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest +# test_download_futures_fail_triggers_shutdown - https://github.com/boto/s3transfer/pull/162 +%pytest -k 'not test_download_futures_fail_triggers_shutdown' %files %{python_files} %license LICENSE.txt