From f9bcbbfa4552aa734e5e68db7344a6ec206f2e94 Mon Sep 17 00:00:00 2001 From: Eric Evans Date: Tue, 8 Nov 2016 18:57:47 -0600 Subject: [PATCH] Updated for Debian release 1.4.1-1 --- debian/changelog | 6 ++--- debian/control | 8 +++--- debian/patches/do-not-use-vendored-code.patch | 27 ------------------- 3 files changed, 8 insertions(+), 33 deletions(-) diff --git a/debian/changelog b/debian/changelog index bdb1972..7350bdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -python-boto3 (1.3.1-1) unstable; urgency=medium +python-boto3 (1.4.1-1) unstable; urgency=medium - * New upstream release. + * New upstream release (Closes: #832559). - -- Eric Evans Sat, 21 May 2016 21:05:31 -0500 + -- Eric Evans Tue, 08 Nov 2016 18:25:42 -0600 python-boto3 (1.2.2-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 1635014..2a54dd7 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,9 @@ Build-Depends: python-all, python-setuptools, python3-all, - python3-setuptools + python3-setuptools, + python-s3transfer (>= 0.1.0), + python3-s3transfer (>= 0.1.0) Standards-Version: 3.9.8 Homepage: https://github.com/boto/boto3 Vcs-Git: git://anonscm.debian.org/users/eevans/python-boto3.git @@ -16,7 +18,7 @@ Vcs-Browser: https://anonscm.debian.org/gitweb/?p=users/eevans/python-boto3.git; Package: python-boto3 Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-botocore, python-requests, python-six +Depends: ${misc:Depends}, ${python:Depends}, python-botocore (>= 1.4.1), python-requests, python-six Description: Python interface to Amazon's Web Services - Python 2.x Boto is the Amazon Web Services interface for Python. It allows developers to write software that makes use of Amazon services like S3 and EC2. Boto @@ -25,7 +27,7 @@ Description: Python interface to Amazon's Web Services - Python 2.x Package: python3-boto3 Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, python3-botocore, python3-requests, python3-six +Depends: ${misc:Depends}, ${python3:Depends}, python3-botocore (>= 1.4.1), python3-requests, python3-six Description: Python interface to Amazon's Web Services - Python 3.x Boto is the Amazon Web Services interface for Python. It allows developers to write software that makes use of Amazon services like S3 and EC2. Boto diff --git a/debian/patches/do-not-use-vendored-code.patch b/debian/patches/do-not-use-vendored-code.patch index 18237fa..f06da21 100644 --- a/debian/patches/do-not-use-vendored-code.patch +++ b/debian/patches/do-not-use-vendored-code.patch @@ -12,20 +12,6 @@ to do the same, here. tests/unit/s3/test_transfer.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) -Index: python-boto3/boto3/s3/transfer.py -=================================================================== ---- python-boto3.orig/boto3/s3/transfer.py -+++ python-boto3/boto3/s3/transfer.py -@@ -135,8 +135,7 @@ import boto3 - from concurrent import futures - - from botocore.compat import six --from botocore.vendored.requests.packages.urllib3.exceptions import \ -- ReadTimeoutError -+from requests.packages.urllib3.exceptions import ReadTimeoutError - from botocore.exceptions import IncompleteReadError - - import boto3.compat Index: python-boto3/tests/functional/test_dynamodb.py =================================================================== --- python-boto3.orig/tests/functional/test_dynamodb.py @@ -53,16 +39,3 @@ Index: python-boto3/boto3/compat.py if six.PY3: # In python3, socket.error is OSError, which is too general -Index: python-boto3/tests/unit/s3/test_transfer.py -=================================================================== ---- python-boto3.orig/tests/unit/s3/test_transfer.py -+++ python-boto3/tests/unit/s3/test_transfer.py -@@ -20,7 +20,7 @@ from contextlib import closing - import mock - from botocore.stub import Stubber - from botocore.session import Session --from botocore.vendored import six -+import six - from concurrent import futures - - from boto3.exceptions import RetriesExceededError