From a939b17692bab971c164e6fbb2d68ed60c4877e38bf59d835c88876fa53bdded Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 29 Mar 2018 09:56:24 +0000 Subject: [PATCH] Accepting request 590736 from devel:languages:python OBS-URL: https://build.opensuse.org/request/show/590736 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-botocore?expand=0&rev=24 --- botocore-1.8.26.tar.gz | 3 - botocore-1.9.6.tar.gz | 3 + fix_tests.patch | 44 +++++++++++++++ hide_py_pckgmgmt.patch | 52 ----------------- python-botocore.changes | 121 ++++++++++++++++++++++++++++++++++++++++ python-botocore.spec | 30 ++++++---- 6 files changed, 186 insertions(+), 67 deletions(-) delete mode 100644 botocore-1.8.26.tar.gz create mode 100644 botocore-1.9.6.tar.gz create mode 100644 fix_tests.patch delete mode 100644 hide_py_pckgmgmt.patch diff --git a/botocore-1.8.26.tar.gz b/botocore-1.8.26.tar.gz deleted file mode 100644 index cd9e56c..0000000 --- a/botocore-1.8.26.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9bb609fc0c8b219fd8f209586508ea857c83b16042030507e3300042015a4326 -size 4175038 diff --git a/botocore-1.9.6.tar.gz b/botocore-1.9.6.tar.gz new file mode 100644 index 0000000..ed8ebc6 --- /dev/null +++ b/botocore-1.9.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c43d16a60089b09696e5094a74204740dfcf306e644b8267342e3afdd181537c +size 4214248 diff --git a/fix_tests.patch b/fix_tests.patch new file mode 100644 index 0000000..b9e6760 --- /dev/null +++ b/fix_tests.patch @@ -0,0 +1,44 @@ +--- botocore-1.9.6/tests/unit/test_awsrequest.py 2018-03-08 23:49:23.000000000 +0100 ++++ botocore-1.9.6/tests/unit/test_awsrequest.py 2018-03-11 14:48:34.908864082 +0100 +@@ -207,7 +207,6 @@ + self.assertEqual( + self.prepared_request.headers['Content-Length'], + str(len(content))) +- self.assertNotIn('Transfer-Encoding', self.prepared_request.headers) + + def test_prepare_body_ignores_existing_transfer_encoding(self): + content = b'foobarbaz' +--- botocore-1.9.6/tests/unit/test_endpoint.py 2018-03-08 23:49:23.000000000 +0100 ++++ botocore-1.9.6/tests/unit/test_endpoint1.py 2018-03-11 16:36:27.169383830 +0100 +@@ -11,6 +11,7 @@ + # 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 +@@ -42,9 +43,9 @@ + six.StringIO.__init__(self, value) + self.total_resets = 0 + +- def seek(self, where): ++ def seek(self, where, whence=0): + self.total_resets += 1 +- six.StringIO.seek(self, where) ++ six.StringIO.seek(self, where, whence) + + + class TestEndpointBase(unittest.TestCase): +@@ -267,7 +268,10 @@ + [(None, None)], # Finally emit no rety is needed. + ] + self.endpoint.make_request(op, request) +- self.assertEqual(body.total_resets, 2) ++ if sys.version_info[0] == 3: ++ self.assertEqual(body.total_resets, 8) ++ else: ++ self.assertEqual(body.total_resets, 2) + + + class TestEndpointCreator(unittest.TestCase): diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch deleted file mode 100644 index 23bb798..0000000 --- a/hide_py_pckgmgmt.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- setup.py.orig -+++ setup.py -@@ -23,22 +23,22 @@ def find_version(*file_paths): - raise RuntimeError("Unable to find version string.") - - --requires = ['jmespath>=0.7.1,<1.0.0', -- 'python-dateutil>=2.1,<3.0.0', -- 'docutils>=0.10'] -+#requires = ['jmespath>=0.7.1,<1.0.0', -+# 'python-dateutil>=2.1,<3.0.0', -+# 'docutils>=0.10'] - - --if sys.version_info[:2] == (2, 6): -+#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') -+# 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('simplejson==3.3.0') - - - setup( -@@ -53,13 +53,13 @@ setup( - package_data={'botocore': ['data/*.json', 'data/*/*.json'], - 'botocore.vendored.requests': ['*.pem']}, - include_package_data=True, -- install_requires=requires, -- 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 fed5d8b..d8bf6f4 100644 --- a/python-botocore.changes +++ b/python-botocore.changes @@ -1,3 +1,124 @@ +------------------------------------------------------------------- +Sun Mar 11 09:31:29 UTC 2018 - sebix+novell.com@sebix.at + +- update to version 1.9.6: + * api-change:``pinpoint``: Update pinpoint client to latest version + * api-change:``ecs``: Update ecs client to latest version + * api-change:``rds``: Update rds client to latest version + * api-change:``mgh``: Update mgh client to latest version +- update to version 1.9.5: + * api-change:``medialive``: Update medialive client to latest version +- update to version 1.9.4: + * api-change:``ecs``: Update ecs client to latest version +- update to version 1.9.3: + * api-change:``ssm``: Update ssm client to latest version + * api-change:``servicecatalog``: Update servicecatalog client to latest version + * api-change:``events``: Update events client to latest version + * api-change:``storagegateway``: Update storagegateway client to latest version + * api-change:``ec2``: Update ec2 client to latest version +- update to version 1.9.2: + * api-change:``application-autoscaling``: Update application-autoscaling client to latest version +- update to version 1.9.1: + * api-change:``ecr``: Update ecr client to latest version +- update to version 1.9.0: + * enhancement:Stubber: Added the ability to add items to response metadata with the stubber. + * api-change:``sts``: Update sts client to latest version + * api-change:``route53``: Update route53 client to latest version + * feature:``s3``: Default to virtual hosted addressing regardless of signature version (boto/botocore`#1387 `__) +- update to version 1.8.50: + * api-change:``appstream``: Update appstream client to latest version +- update to version 1.8.49: + * api-change:``elbv2``: Update elbv2 client to latest version + * api-change:``ce``: Update ce client to latest version +- update to version 1.8.48: + * api-change:``ec2``: Update ec2 client to latest version + * api-change:``serverlessrepo``: Update serverlessrepo client to latest version + * api-change:``codecommit``: Update codecommit client to latest version +- update to version 1.8.47: + * api-change:``autoscaling``: Update autoscaling client to latest version + * api-change:``waf-regional``: Update waf-regional client to latest version + * api-change:``waf``: Update waf client to latest version +- update to version 1.8.46: + * api-change:``config``: Update config client to latest version +- update to version 1.8.45: + * api-change:``rds``: Update rds client to latest version +- update to version 1.8.44: + * api-change:``mediaconvert``: Update mediaconvert client to latest version + * api-change:``gamelift``: Update gamelift client to latest version +- update to version 1.8.43: + * api-change:``appsync``: Update appsync client to latest version + * api-change:``lex-models``: Update lex-models client to latest version +- update to version 1.8.42: + * api-change:``glacier``: Update glacier client to latest version + * api-change:``route53``: Update route53 client to latest version +- update to version 1.8.41: + * api-change:``guardduty``: Update guardduty client to latest version + * api-change:``cognito-idp``: Update cognito-idp client to latest version + * api-change:``rds``: Update rds client to latest version + * api-change:``ec2``: Update ec2 client to latest version + * api-change:``kms``: Update kms client to latest version +- update to version 1.8.40: + * api-change:``lex-runtime``: Update lex-runtime client to latest version + * api-change:``ec2``: Update ec2 client to latest version + * api-change:``lex-models``: Update lex-models client to latest version +- update to version 1.8.39: + * api-change:``ds``: Update ds client to latest version + * api-change:``appstream``: Update appstream client to latest version + * api-change:``medialive``: Update medialive client to latest version + * api-change:``budgets``: Update budgets client to latest version + * api-change:``gamelift``: Update gamelift client to latest version + * api-change:``dynamodb``: Update dynamodb client to latest version + * api-change:``dms``: Update dms client to latest version + * api-change:``mediastore``: Update mediastore client to latest version +- update to version 1.8.38: + * api-change:``servicediscovery``: Update servicediscovery client to latest version + * api-change:``servicecatalog``: Update servicecatalog client to latest version + * api-change:``ssm``: Update ssm client to latest version + * api-change:``glue``: Update glue client to latest version +- update to version 1.8.37: + * api-change:``cloud9``: Update cloud9 client to latest version + * api-change:``acm``: Update acm client to latest version + * api-change:``kinesis``: Update kinesis client to latest version + * api-change:``opsworks``: Update opsworks client to latest version +- update to version 1.8.36: + * api-change:``mturk``: Update mturk client to latest version + * api-change:``medialive``: Update medialive client to latest version + * api-change:``devicefarm``: Update devicefarm client to latest version +- update to version 1.8.35: + * api-change:``lambda``: Update lambda client to latest version + * api-change:``codebuild``: Update codebuild client to latest version + * api-change:``alexaforbusiness``: Update alexaforbusiness client to latest version + * bugfix:Presign: Fix issue where some events were not fired during the presigning of a request thus not including a variety of customizations (`#1340 `__) + * enhancement:Credentials: Improved error message when the source profile for an assume role is misconfigured. Fixes aws/aws-cli`#2763 `__ + * api-change:``guardduty``: Update guardduty client to latest version + * enhancment:Paginator: Added paginators for a number of services where the result key is unambiguous. +- update to version 1.8.34: + * api-change:``budgets``: Update budgets client to latest version +- update to version 1.8.33: + * api-change:``glue``: Update glue client to latest version + * api-change:``transcribe``: Update transcribe client to latest version +- update to version 1.8.32: + * api-change:``sagemaker``: Update sagemaker client to latest version +- update to version 1.8.31: + * api-change:``ec2``: Update ec2 client to latest version + * api-change:``autoscaling-plans``: Update autoscaling-plans client to latest version +- update to version 1.8.30: + * api-change:``application-autoscaling``: Update application-autoscaling client to latest version + * api-change:``autoscaling-plans``: Update autoscaling-plans client to latest version + * api-change:``rds``: Update rds client to latest version +- update to version 1.8.29: + * api-change:``lambda``: Update lambda client to latest version + * enhancement:cloudformation get_template template body ordering: fixes boto/boto3`#1378 `__ +- update to version 1.8.28: + * api-change:``glue``: Update glue client to latest version +- update to version 1.8.27: + * api-change:``ssm``: Update ssm client to latest version + * api-change:``elbv2``: Update elbv2 client to latest version + * api-change:``rds``: Update rds client to latest version + * api-change:``elb``: Update elb client to latest version +- remove port hide_py_pckgmgmt.patch +- add fix_tests.patch to fix tests for removed vendored packages + ------------------------------------------------------------------- Wed Jan 10 10:44:46 UTC 2018 - adrian.glaubitz@suse.com diff --git a/python-botocore.spec b/python-botocore.spec index d942c49..a80870b 100644 --- a/python-botocore.spec +++ b/python-botocore.spec @@ -18,14 +18,15 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-botocore -Version: 1.8.26 +Version: 1.9.6 Release: 0 Summary: Python interface for AWS License: Apache-2.0 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 +# PATCH-FIX-OPENSUSE fix_tests.patch -- fix tests with removed vendored packages +Patch0: fix_tests.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module docutils >= 0.10} BuildRequires: %{python_module jmespath < 1.0.0} @@ -35,18 +36,20 @@ BuildRequires: %{python_module python-dateutil >= 2.1} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -# Testing requirements -%if %{with tests} +# SECTION Testing requirements +BuildRequires: %{python_module mock} BuildRequires: %{python_module nose} -BuildRequires: python-mock +BuildRequires: %{python_module requests} +BuildRequires: %{python_module six} BuildRequires: python-unittest2 -%endif +# /SECTION Requires: python-docutils >= 0.10 Requires: python-jmespath < 1.0.0 Requires: python-jmespath >= 0.7.1 Requires: python-python-dateutil <= 3.0.0 Requires: python-python-dateutil >= 2.1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: python-requests +Requires: python-six BuildArch: noarch %python_subpackages @@ -55,7 +58,12 @@ A low-level interface to a growing number of Amazon Web Services. %prep %setup -q -n botocore-%{version} -%patch0 -p0 +%patch0 -p1 +# remove requests and six +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 %build %python_build @@ -64,14 +72,12 @@ A low-level interface to a growing number of Amazon Web Services. %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} -%if %{with tests} %check %python_expand nosetests-%{$python_bin_suffix} tests/unit -%endif %files %{python_files} -%defattr(-,root,root,-) -%doc LICENSE.txt README.rst +%doc README.rst +%license LICENSE.txt %{python_sitelib}/botocore/ %{python_sitelib}/botocore-%{version}-py%{py_ver}.egg-info