diff -u python-boto-2.49.0/debian/changelog python-boto-2.49.0/debian/changelog --- python-boto-2.49.0/debian/changelog +++ python-boto-2.49.0/debian/changelog @@ -1,12 +1,9 @@ -python-boto (2.49.0-2ubuntu1) eoan; urgency=medium +python-boto (2.49.0-2.1) unstable; urgency=medium - * Merge with Debian unstable. Remaining changes: - - d/tests/unit: Fix autopkgtest error in test_timeout by using a - temporary HOME directory. - - d/tests/unit: Workaround unit test by unsetting *_proxy vars - before running dep8 unit test. See: LP #1698222. + * Non-maintainer upload. + * Removed Python 2 support (Closes: #937617). - -- Bryce Harrington Mon, 05 Aug 2019 20:53:54 -0700 + -- Thomas Goirand Wed, 25 Dec 2019 21:28:06 +0100 python-boto (2.49.0-2) unstable; urgency=medium @@ -20,29 +17,6 @@ -- Eric Evans Mon, 22 Jul 2019 14:56:38 -0500 -python-boto (2.44.0-1.1ubuntu1) disco; urgency=medium - - * Merge from Debian unstable. Remaining chnages: - * Workaround unit test by unsetting *_proxy vars before running dep8 unit - test. See: LP #1698222. - * d/tests/unit: Fix autopkgtest error in test_timeout. - - -- Dimitri John Ledkov Wed, 05 Dec 2018 00:35:47 +0000 - -python-boto (2.44.0-1ubuntu2) artful; urgency=medium - - * Workaround unit test by unsetting *_proxy vars before running dep8 unit - test. See: LP #1698222. - - -- David Britton Fri, 16 Jun 2017 10:00:33 -0600 - -python-boto (2.44.0-1ubuntu1) zesty; urgency=medium - - * Merge from Debian unstable. Remaining changes: - * d/tests/unit: Fix autopkgtest error in test_timeout. - - -- Jon Grimm Fri, 03 Feb 2017 13:15:39 -0600 - python-boto (2.44.0-1) unstable; urgency=medium * New upstream release. @@ -55,40 +29,18 @@ -- Eric Evans Tue, 08 Nov 2016 21:17:35 -0600 -python-boto (2.40.0-1ubuntu1) yakkety; urgency=low - - * Merge from Debian unstable. Remaining changes: - * d/tests/unit: Fix autopkgtest error in test_timeout. - - -- James Page Fri, 24 Jun 2016 14:40:43 +0100 - python-boto (2.40.0-1) unstable; urgency=medium * New upstream release. -- Eric Evans Sun, 22 May 2016 14:22:08 -0500 -python-boto (2.38.0-1ubuntu1) wily; urgency=low - - * Merge from Debian unstable. Remaining changes: - * d/tests/unit: Fix autopkgtest error in test_timeout. - * d/tests/unit: run tests/test.py with each python in 'pyversions -i' - - -- James Page Thu, 09 Jul 2015 16:11:38 +0100 - python-boto (2.38.0-1) unstable; urgency=medium * New upstream release. -- Eric Evans Sun, 14 Jun 2015 09:43:42 -0500 -python-boto (2.34.0-2ubuntu1) vivid; urgency=low - - * Merge from Debian unstable. Remaining changes: - * d/tests: Add autopkgtests - - -- Chuck Short Sun, 23 Nov 2014 20:11:53 -0500 - python-boto (2.34.0-2) unstable; urgency=medium * Upload to unstable. @@ -119,14 +71,6 @@ -- Thomas Goirand Fri, 12 Sep 2014 08:21:48 +0000 -python-boto (2.29.1-1ubuntu1) utopic; urgency=medium - - * Merge with debian. Remaining Ubuntu changes: - * d/tests/unit: Fix autopkgtest error in test_timeout. - * d/tests/unit: run tests/test.py with each python in 'pyversions -i' - - -- Scott Moser Fri, 25 Jul 2014 12:59:34 -0400 - python-boto (2.29.1-1) unstable; urgency=medium * New upstream release (Closes: #750571). @@ -146,23 +90,6 @@ -- Eric Evans Fri, 07 Feb 2014 20:32:57 -0600 -python-boto (2.20.1-2ubuntu2) trusty; urgency=medium - - * d/tests/unit: Fix autopkgtest error in test_timeout. - * Add patch to fix autopkgtest failure in test_trim_defaults. - Taken from upstream git repository commits 3ebb667b and eb4c6e37. - - -- Corey Bryant Wed, 26 Mar 2014 13:52:31 -0400 - -python-boto (2.20.1-2ubuntu1) trusty; urgency=medium - - * Add missing python-requests dependency, spotted by autopkgtest. - * Add python-requests test dependency, as the test does not actually depend - on python-boto (this test needs to be fixed to run against the installed - package). - - -- Martin Pitt Wed, 26 Feb 2014 15:51:00 +0100 - python-boto (2.20.1-2) experimental; urgency=low * Run unit tests with autopkgtest. diff -u python-boto-2.49.0/debian/control python-boto-2.49.0/debian/control --- python-boto-2.49.0/debian/control +++ python-boto-2.49.0/debian/control @@ -1,14 +1,10 @@ Source: python-boto Section: python Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Eric Evans +Maintainer: Eric Evans Build-Depends: debhelper-compat (= 12), - python-all (>= 2.6.6-3), - python-setuptools, python3-all (>= 3.2), python3-setuptools, - python-six, python3-six, dh-python XS-Testsuite: autopkgtest @@ -17,34 +13,6 @@ Vcs-Git: https://salsa.debian.org/eevans/python-boto.git Standards-Version: 4.4.0 -Package: python-boto -Architecture: all -Depends: python-requests, ${misc:Depends}, ${python:Depends}, python-six -Provides: ${python:Provides} -Description: Python interface to Amazon's Web Services - Python 2.x - Boto is a Python interface to the infrastructure services available from - Amazon. - . - Boto supports the following services: - * Elastic Compute Cloud (EC2) - * Elastic MapReduce - * CloudFront - * DynamoDB - * SimpleDB - * Relational Database Service (RDS) - * Identity and Access Management (IAM) - * Simple Queue Service (SQS) - * CloudWatch - * Route53 - * Elastic Load Balancing (ELB) - * Flexible Payment Service (FPS) - * Simple Storage Service (S3) - * Glacier - * Elastic Block Store (EBS) - * and many more... - . - This package provides the Python 2.x module. - Package: python3-boto Architecture: all Depends: python3-requests, ${misc:Depends}, ${python3:Depends}, python3-six reverted: --- python-boto-2.49.0/debian/gbp.conf +++ python-boto-2.49.0.orig/debian/gbp.conf @@ -1,7 +0,0 @@ -[DEFAULT] -upstream-branch = upstream -debian-branch = master - -[buildpackage] -pbuilder = True -pbuilder-options = --source-only-changes diff -u python-boto-2.49.0/debian/rules python-boto-2.49.0/debian/rules --- python-boto-2.49.0/debian/rules +++ python-boto-2.49.0/debian/rules @@ -1,6 +1,5 @@ #!/usr/bin/make -f -PYTHONS:=$(shell pyversions -vr) PYTHON3S:=$(shell py3versions -vr) clean: @@ -19,7 +18,7 @@ build-stamp: dh_testdir - python setup.py build + python3 setup.py build touch build-stamp @@ -27,18 +26,6 @@ dh_testdir dh_installdirs - # Python 2.x - set -e ; for pyvers in $(PYTHONS); do \ - python$$pyvers setup.py install --root $(CURDIR)/debian/python-boto \ - --install-scripts usr/share/doc/python-boto/examples/ \ - --install-layout=deb ; \ - done - - for f in `find $(CURDIR)/debian/python-boto -name \*.py`; do \ - sed -e '\,^#!/usr/bin/env python,d' < $$f > $$f.tmp; \ - mv $$f.tmp $$f; \ - done - # Python 3.x set -e ; for pyvers in $(PYTHON3S); do \ python$$pyvers setup.py install --root $(CURDIR)/debian/python3-boto \ @@ -54,7 +41,6 @@ dh_installchangelogs dh_compress dh_fixperms - dh_python2 dh_python3 dh_gencontrol dh_installdeb diff -u python-boto-2.49.0/debian/tests/control python-boto-2.49.0/debian/tests/control --- python-boto-2.49.0/debian/tests/control +++ python-boto-2.49.0/debian/tests/control @@ -1,3 +1,3 @@ Tests: unit -Depends: python-boto, python-nose (>= 1.3.0), python-mock (>= 1.0.1), python-httpretty (>= 0.6.3) +Depends: python3-boto, python3-nose (>= 1.3.0), python3-mock (>= 1.0.1), python3-httpretty (>= 0.6.3) Restrictions: allow-stderr diff -u python-boto-2.49.0/debian/tests/unit python-boto-2.49.0/debian/tests/unit --- python-boto-2.49.0/debian/tests/unit +++ python-boto-2.49.0/debian/tests/unit @@ -3,24 +3,7 @@ -set -ex - -#Create temporary home directory with .ssh/known_hosts file -#so that test_timeout will be able to work. -home_orig=$HOME -home_temp=$(mktemp -d) -mkdir -p "$home_temp/.ssh" -touch "$home_temp/.ssh/known_hosts" -export HOME=$home_temp -unset http_proxy -unset https_proxy -unset no_proxy - set -eu cp -r tests "$ADTTMP/" cd "$ADTTMP" -for python in $(pyversions -i); do +for python in $(py3versions -i); do $python tests/test.py unit > /dev/null done - -#Restore original home directory and remove temp home dir -export HOME=$home_orig -rm -rf $home_temp