From e14c02921d1f0831f6ec343d4cc013492dc54c25b86d04420730953294173e99 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Wed, 12 Sep 2018 17:15:43 +0000 Subject: [PATCH] Accepting request 635342 from home:glaubitz:branches:devel:languages:python:aws - Version update to 1.11.1 * api-change:``glue``: Update glue client to latest version - from version 1.11.0 * api-change:``events``: Update events client to latest version * api-change:``cognito-idp``: Update cognito-idp client to latest version * feature:urllib3: The vendored version of requests and urllib3 are no longer being used and botocore now has a direct dependency on newer versions of upstream urllib3. - from version 1.10.84 * api-change:``iot``: Update iot client to latest version * api-change:``rekognition``: Update rekognition client to latest version * api-change:``lex-models``: Update lex-models client to latest version * api-change:``iotanalytics``: Update iotanalytics client to latest version * api-change:``medialive``: Update medialive client to latest version - from version 1.10.83 * api-change:``snowball``: Update snowball client to latest version - from version 1.10.82 * api-change:``ec2``: Update ec2 client to latest version * api-change:``dlm``: Update dlm client to latest version * api-change:``rds``: Update rds client to latest version * api-change:``elasticbeanstalk``: Update elasticbeanstalk client to latest version - from version 1.10.81 * api-change:``mediaconvert``: Update mediaconvert client to latest version * api-change:``dynamodb``: Update dynamodb client to latest version - from version 1.10.80 * api-change:``dax``: Update dax client to latest version * api-change:``secretsmanager``: Update secretsmanager client to latest version * api-change:``sagemaker``: Update sagemaker client to latest version - from version 1.10.79 * api-change:``discovery``: Update discovery client to latest version * api-change:``ssm``: Update ssm client to latest version * api-change:``ec2``: Update ec2 client to latest version OBS-URL: https://build.opensuse.org/request/show/635342 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:aws/python-botocore?expand=0&rev=16 --- botocore-1.10.75.tar.gz | 3 -- botocore-1.11.1.tar.gz | 3 ++ hide_py_pckgmgmt.patch | 72 +++++++++++++++++++++++++++++++---------- python-botocore.changes | 50 ++++++++++++++++++++++++++++ python-botocore.spec | 13 ++++---- skip_test_on15.patch | 30 ----------------- 6 files changed, 114 insertions(+), 57 deletions(-) delete mode 100644 botocore-1.10.75.tar.gz create mode 100644 botocore-1.11.1.tar.gz delete mode 100644 skip_test_on15.patch diff --git a/botocore-1.10.75.tar.gz b/botocore-1.10.75.tar.gz deleted file mode 100644 index 1a05646..0000000 --- a/botocore-1.10.75.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82055917cb431c1cee7c737189a170cc92ffc3824a6da504e8d3ff4df9fa2eab -size 4564555 diff --git a/botocore-1.11.1.tar.gz b/botocore-1.11.1.tar.gz new file mode 100644 index 0000000..399ce33 --- /dev/null +++ b/botocore-1.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:792e18522817e4a76eb11912e750233c3111f1790ee3adcc1203be9a7caf13e4 +size 4818529 diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch index 107e061..70da82b 100644 --- a/hide_py_pckgmgmt.patch +++ b/hide_py_pckgmgmt.patch @@ -1,31 +1,69 @@ -Index: botocore-1.10.62/setup.py -=================================================================== ---- botocore-1.10.62.orig/setup.py -+++ botocore-1.10.62/setup.py -@@ -42,6 +42,7 @@ if sys.version_info[:2] == (2, 6): - else: - requires.append('python-dateutil>=2.1,<3.0.0') +diff -Nru botocore-1.11.1.orig/setup.py botocore-1.11.1/setup.py +--- botocore-1.11.1.orig/setup.py 2018-08-25 03:51:41.000000000 +0200 ++++ botocore-1.11.1/setup.py 2018-08-25 17:29:08.588407739 +0200 +@@ -23,25 +23,25 @@ + raise RuntimeError("Unable to find version string.") + + +-requires = ['jmespath>=0.7.1,<1.0.0', +- 'docutils>=0.10', +- 'urllib3>=1.20,<1.24'] +- +- +-if sys.version_info[:2] == (2, 6): +- # For python2.6 we have a few other dependencies. +- # First we need an ordered dictionary so we use the +- # 2.6 backport. +- requires.append('ordereddict==1.1') +- # Then we need simplejson. This is because we need +- # a json version that allows us to specify we want to +- # use an ordereddict instead of a normal dict for the +- # JSON objects. The 2.7 json module has this. For 2.6 +- # we need simplejson. +- requires.append('simplejson==3.3.0') +- requires.append('python-dateutil>=2.1,<2.7.0') +-else: +- requires.append('python-dateutil>=2.1,<3.0.0') ++# requires = ['jmespath>=0.7.1,<1.0.0', ++# 'docutils>=0.10', ++# 'urllib3>=1.20,<1.24'] ++ ++ ++# if sys.version_info[:2] == (2, 6): ++# # For python2.6 we have a few other dependencies. ++# # First we need an ordered dictionary so we use the ++# # 2.6 backport. ++# requires.append('ordereddict==1.1') ++# # Then we need simplejson. This is because we need ++# # a json version that allows us to specify we want to ++# # use an ordereddict instead of a normal dict for the ++# # JSON objects. The 2.7 json module has this. For 2.6 ++# # we need simplejson. ++# requires.append('simplejson==3.3.0') ++# requires.append('python-dateutil>=2.1,<2.7.0') ++# else: ++# requires.append('python-dateutil>=2.1,<3.0.0') -+requires = [] setup( - name='botocore', -@@ -56,12 +57,12 @@ setup( +@@ -56,13 +56,13 @@ + package_data={'botocore': ['cacert.pem', 'data/*.json', 'data/*/*.json'], 'botocore.vendored.requests': ['*.pem']}, include_package_data=True, - install_requires=requires, +- install_requires=requires, - extras_require={ - ':python_version=="2.6"': [ - 'ordereddict==1.1', - 'simplejson==3.3.0', - ] - }, -+# extras_require={ -+# ':python_version=="2.6"': [ -+# 'ordereddict==1.1', -+# 'simplejson==3.3.0', -+# ] -+# }, ++ # install_requires=requires, ++ # extras_require={ ++ # ':python_version=="2.6"': [ ++ # 'ordereddict==1.1', ++ # 'simplejson==3.3.0', ++ # ] ++ # }, license="Apache License 2.0", classifiers=( 'Development Status :: 5 - Production/Stable', diff --git a/python-botocore.changes b/python-botocore.changes index ee33caa..50cc753 100644 --- a/python-botocore.changes +++ b/python-botocore.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Wed Sep 12 11:18:50 UTC 2018 - John Paul Adrian Glaubitz + +- Version update to 1.11.1 + * api-change:``glue``: Update glue client to latest version +- from version 1.11.0 + * api-change:``events``: Update events client to latest version + * api-change:``cognito-idp``: Update cognito-idp client to latest version + * feature:urllib3: The vendored version of requests and urllib3 are no longer being used and botocore now has a direct dependency on newer versions of upstream urllib3. +- from version 1.10.84 + * api-change:``iot``: Update iot client to latest version + * api-change:``rekognition``: Update rekognition client to latest version + * api-change:``lex-models``: Update lex-models client to latest version + * api-change:``iotanalytics``: Update iotanalytics client to latest version + * api-change:``medialive``: Update medialive client to latest version +- from version 1.10.83 + * api-change:``snowball``: Update snowball client to latest version +- from version 1.10.82 + * api-change:``ec2``: Update ec2 client to latest version + * api-change:``dlm``: Update dlm client to latest version + * api-change:``rds``: Update rds client to latest version + * api-change:``elasticbeanstalk``: Update elasticbeanstalk client to latest version +- from version 1.10.81 + * api-change:``mediaconvert``: Update mediaconvert client to latest version + * api-change:``dynamodb``: Update dynamodb client to latest version +- from version 1.10.80 + * api-change:``dax``: Update dax client to latest version + * api-change:``secretsmanager``: Update secretsmanager client to latest version + * api-change:``sagemaker``: Update sagemaker client to latest version +- from version 1.10.79 + * api-change:``discovery``: Update discovery client to latest version + * api-change:``ssm``: Update ssm client to latest version + * api-change:``ec2``: Update ec2 client to latest version + * api-change:``redshift``: Update redshift client to latest version + * api-change:``mediaconvert``: Update mediaconvert client to latest version +- from version 1.10.78 + * api-change:``devicefarm``: Update devicefarm client to latest version +- from version 1.10.77 + * api-change:``es``: Update es client to latest version + * api-change:``autoscaling``: Update autoscaling client to latest version + * api-change:``cloudfront``: Update cloudfront client to latest version +- from version 1.10.76 + * api-change:``sagemaker``: Update sagemaker client to latest version +- Drop obsolete patches + + skip_test_on15.patch +- Refresh patches for new version + + hide_py_pckgmgmt.patch +- Update BuildRequires in spec file from setup.py +- Update sed expression to patch out vendored modules + ------------------------------------------------------------------- Mon Aug 13 18:33:37 UTC 2018 - rjschwei@suse.com diff --git a/python-botocore.spec b/python-botocore.spec index f3f985d..0839133 100644 --- a/python-botocore.spec +++ b/python-botocore.spec @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-botocore -Version: 1.10.75 +Version: 1.11.1 Release: 0 Summary: Python interface for AWS License: Apache-2.0 @@ -26,13 +26,14 @@ Group: Development/Languages/Python Url: https://github.com/boto/botocore Source: https://files.pythonhosted.org/packages/source/b/botocore/botocore-%{version}.tar.gz Patch0: hide_py_pckgmgmt.patch -Patch1: skip_test_on15.patch BuildRequires: %{python_module docutils >= 0.10} BuildRequires: %{python_module jmespath < 1.0.0} BuildRequires: %{python_module jmespath >= 0.7.1} BuildRequires: %{python_module python-dateutil <= 3.0.0} BuildRequires: %{python_module python-dateutil >= 2.1} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module urllib3 < 1.24} +BuildRequires: %{python_module urllib3 >= 1.20} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-docutils >= 0.10 @@ -57,14 +58,12 @@ A low-level interface to a growing number of Amazon Web Services. %prep %setup -q -n botocore-%{version} %patch0 -p1 -%if 0%{?suse_version} >= 1500 -%patch1 -%endif # remove bundeled 3rd party Python modules rm -r botocore/vendored/ # fix all imports: -sed -i 's/from botocore\.vendored //' botocore/*.py tests/unit/*.py -sed -i 's/botocore\.vendored\.//' botocore/*.py tests/unit/*.py tests/unit/auth/*.py +sed -i 's/from botocore\.vendored //' botocore/*.py tests/functional/*.py tests/integration/*.py tests/unit/*.py +sed -i 's/botocore.vendored.requests.model.Response/requests.model.Response/' botocore/endpoint.py +sed -i 's/botocore\.vendored\.//' botocore/*.py tests/functional/*.py tests/integration/*.py tests/unit/*.py %build %python_build diff --git a/skip_test_on15.patch b/skip_test_on15.patch deleted file mode 100644 index bc9977e..0000000 --- a/skip_test_on15.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- tests/unit/test_awsrequest.py.orig -+++ tests/unit/test_awsrequest.py -@@ -197,6 +197,7 @@ class TestAWSPreparedRequest(unittest.Te - str(len(content))) - - def test_prepare_body_removes_transfer_encoding(self): -+ return - self.prepared_request.headers['Transfer-Encoding'] = 'chunked' - content = b'foobarbaz' - with open(self.filename, 'wb') as f: ---- tests/unit/test_endpoint.py.orig -+++ tests/unit/test_endpoint.py -@@ -11,6 +11,8 @@ - # ANY KIND, either express or implied. See the License for the specific - # language governing permissions and limitations under the License. - -+import sys -+ - from tests import unittest - - from mock import Mock, patch, sentinel -@@ -257,6 +259,8 @@ class TestS3ResetStreamOnRetry(TestEndpo - return 0 - - def test_reset_stream_on_retry(self): -+ if sys.version_info[0] == 3: -+ return - op = Mock() - body = RecordStreamResets('foobar') - op.name = 'PutObject'