1
0

Accepting request 635519 from devel:languages:python:aws

OBS-URL: https://build.opensuse.org/request/show/635519
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-botocore?expand=0&rev=32
This commit is contained in:
Yuchen Lin 2018-09-13 22:02:27 +00:00 committed by Git OBS Bridge
commit 29f21843e6
6 changed files with 114 additions and 57 deletions

View File

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

3
botocore-1.11.1.tar.gz Normal file
View File

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

View File

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

View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Thu Sep 13 10:53:27 UTC 2018 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Version update to 1.11.1 (bsc#1095041)
* 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

View File

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

View File

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