From f2b07993876fc11692eb973da06e00c9ed2c8e5332eb1f95b58c7019ee24a947 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Mon, 14 Oct 2019 18:16:20 +0000 Subject: [PATCH] Accepting request 738330 from home:glaubitz:branches:Cloud:Tools - Update to version 1.16.258 + For detailed changes see https://github.com/aws/aws-cli/blob/1.16.258/CHANGELOG.rst + Forward port hide_py_pckgmgmt.patch + Update Requires in spec file from setup.py OBS-URL: https://build.opensuse.org/request/show/738330 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=68 --- aws-cli-1.16.223.tar.gz | 3 --- aws-cli-1.16.258.tar.gz | 3 +++ aws-cli.changes | 9 +++++++ aws-cli.spec | 6 ++--- hide_py_pckgmgmt.patch | 58 +++++++++++++++++++++++++---------------- 5 files changed, 51 insertions(+), 28 deletions(-) delete mode 100644 aws-cli-1.16.223.tar.gz create mode 100644 aws-cli-1.16.258.tar.gz diff --git a/aws-cli-1.16.223.tar.gz b/aws-cli-1.16.223.tar.gz deleted file mode 100644 index 8e5960e..0000000 --- a/aws-cli-1.16.223.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ebe5277235947065d1dc2c6751240f69085c81c0cd990c7d0bb60293f06f982 -size 1366517 diff --git a/aws-cli-1.16.258.tar.gz b/aws-cli-1.16.258.tar.gz new file mode 100644 index 0000000..0978ba9 --- /dev/null +++ b/aws-cli-1.16.258.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8063686877fb37a084564b627f0d5435d0a460163776fefee01fd099675a0d4 +size 1470566 diff --git a/aws-cli.changes b/aws-cli.changes index 58d541e..edc4e12 100644 --- a/aws-cli.changes +++ b/aws-cli.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Oct 14 12:43:10 UTC 2019 - John Paul Adrian Glaubitz + +- Update to version 1.16.258 + + For detailed changes see + https://github.com/aws/aws-cli/blob/1.16.258/CHANGELOG.rst + + Forward port hide_py_pckgmgmt.patch + + Update Requires in spec file from setup.py + ------------------------------------------------------------------- Fri Sep 27 18:41:35 UTC 2019 - Robert Schweikert diff --git a/aws-cli.spec b/aws-cli.spec index ec96dcc..3f7fd8c 100644 --- a/aws-cli.spec +++ b/aws-cli.spec @@ -17,7 +17,7 @@ Name: aws-cli -Version: 1.16.223 +Version: 1.16.258 Release: 0 Summary: Amazon Web Services Command Line Interface License: Apache-2.0 @@ -31,8 +31,8 @@ BuildRequires: fdupes Requires: python3 Requires: python3-PyYAML <= 6.0.0 Requires: python3-PyYAML >= 3.10 -Requires: python3-botocore >= 1.12.213 -Requires: python3-colorama <= 0.4.1 +Requires: python3-botocore >= 1.12.248 +Requires: python3-colorama <= 0.4.2 Requires: python3-colorama >= 0.2.5 Requires: python3-docutils >= 0.10 Requires: python3-rsa < 5.0.0 diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch index 72c76f2..f9ca302 100644 --- a/hide_py_pckgmgmt.patch +++ b/hide_py_pckgmgmt.patch @@ -1,57 +1,71 @@ ---- setup.py.orig 2019-08-21 20:20:11.000000000 +0200 -+++ setup.py 2019-08-22 15:09:23.121269602 +0200 -@@ -23,23 +23,23 @@ +--- setup.py.orig 2019-10-11 20:12:23.000000000 +0200 ++++ setup.py 2019-10-14 14:42:54.622237116 +0200 +@@ -23,30 +23,30 @@ raise RuntimeError("Unable to find version string.") --requires = ['botocore==1.12.213', -- 'colorama>=0.2.5,<=0.3.9', -- 'docutils>=0.10,<0.16', -- 'rsa>=3.1.2,<=3.5.0', -- 's3transfer>=0.2.0,<0.3.0'] +-install_requires = ['botocore==1.12.248', +- 'docutils>=0.10,<0.16', +- 'rsa>=3.1.2,<=3.5.0', +- 's3transfer>=0.2.0,<0.3.0'] - - -if sys.version_info[:2] == (2, 6): - # For python2.6 we have to require argparse since it - # was not in stdlib until 2.7. -- requires.append('argparse>=1.1') +- install_requires.append('argparse>=1.1') - - # For Python 2.6, we have to require a different verion of PyYAML since the latest - # versions dropped support for Python 2.6. -- requires.append('PyYAML>=3.10,<=3.13') +- install_requires.append('PyYAML>=3.10,<=3.13') +- +- # Colorama removed support for EOL pythons. +- install_requires.append('colorama>=0.2.5,<=0.3.9') +-elif sys.version_info[:2] == (3, 3): +- install_requires.append('PyYAML>=3.10,<=3.13') +- # Colorama removed support for EOL pythons. +- install_requires.append('colorama>=0.2.5,<=0.3.9') -else: -- requires.append('PyYAML>=3.10,<=5.2') -+# requires = ['botocore==1.12.213', -+# 'colorama>=0.2.5,<=0.3.9', -+# 'docutils>=0.10,<0.16', -+# 'rsa>=3.1.2,<=3.5.0', -+# 's3transfer>=0.2.0,<0.3.0'] +- install_requires.append('PyYAML>=3.10,<5.2') +- install_requires.append('colorama>=0.2.5,<0.4.2') ++# install_requires = ['botocore==1.12.248', ++# 'docutils>=0.10,<0.16', ++# 'rsa>=3.1.2,<=3.5.0', ++# 's3transfer>=0.2.0,<0.3.0'] + + +# if sys.version_info[:2] == (2, 6): +# # For python2.6 we have to require argparse since it +# # was not in stdlib until 2.7. -+# requires.append('argparse>=1.1') ++# install_requires.append('argparse>=1.1') + +# # For Python 2.6, we have to require a different verion of PyYAML since the latest +# # versions dropped support for Python 2.6. -+# requires.append('PyYAML>=3.10,<=3.13') ++# install_requires.append('PyYAML>=3.10,<=3.13') ++ ++# # Colorama removed support for EOL pythons. ++# install_requires.append('colorama>=0.2.5,<=0.3.9') ++# elif sys.version_info[:2] == (3, 3): ++# install_requires.append('PyYAML>=3.10,<=3.13') ++# # Colorama removed support for EOL pythons. ++# install_requires.append('colorama>=0.2.5,<=0.3.9') +# else: -+# requires.append('PyYAML>=3.10,<=5.2') ++# install_requires.append('PyYAML>=3.10,<5.2') ++# install_requires.append('colorama>=0.2.5,<0.4.2') setup_options = dict( -@@ -57,12 +57,12 @@ +@@ -64,12 +64,12 @@ 'examples/*/*.txt', 'examples/*/*/*.txt', 'examples/*/*/*.rst', 'topics/*.rst', 'topics/*.json']}, -- install_requires=requires, +- install_requires=install_requires, - extras_require={ - ':python_version=="2.6"': [ - 'argparse>=1.1', - ] - }, -+ # install_requires=requires, ++ # install_requires=install_requires, + # extras_require={ + # ':python_version=="2.6"': [ + # 'argparse>=1.1',