Hi,
Here's the proposed NMU debdiff. I'm uploading it to delayed/7 since the
bug has been opened for so long, there's no reverse dependency for the
py2 only package, and the package will be AUTORM in 22 days.
Cheers,
Thomas Goirand (zigo)
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,3 +1,10 @@
+python-boto (2.49.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Removed Python 2 support (Closes: #937617).
+
+ -- Thomas Goirand <z...@debian.org> Wed, 25 Dec 2019 21:28:06 +0100
+
python-boto (2.49.0-2) unstable; urgency=medium
* Re-enable boto.vendored package (for regions sub-pacakge).
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
@@ -3,11 +3,8 @@
Priority: optional
Maintainer: Eric Evans <eev...@debian.org>
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
@@ -16,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
@@ -5,5 +5,5 @@
cd "$ADTTMP"
-for python in $(pyversions -i); do
+for python in $(py3versions -i); do
$python tests/test.py unit > /dev/null
done
