Merge ~oddbloke/ubuntu/+source/simplestreams:new_upstream_snapshot into ubuntu/+source/simplestreams:ubuntu/devel

[Dan Watkins]

[Bryce Harrington (bryce)]

Code changes look good, the PPA you set up has built successfully:

https://launchpad.net/~daniel-thewatkins/+archive/ubuntu/streams/+packages

Due to LP: #1734657, git ubuntu is not able to build the source package, but I've used the .dsc from the ppa for the upload, and pushed the upload tag for this branch:

$ git push pkg upload/0.1.0-30-g3cc8988a-0ubuntu1
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/simplestreams
 * [new tag] upload/0.1.0-30-g3cc8988a-0ubuntu1 -> upload/0.1.0-30-g3cc8988a-0ubuntu1

$ dput ubuntu simplestreams_0.1.0-30-g3cc8988a-0ubuntu1_source.changes
Checking signature on .changes
gpg: /home/bryce/ubuntu/SimpleStreams/focal/simplestreams_0.1.0-30-g3cc8988a-0ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: /home/bryce/ubuntu/SimpleStreams/focal/simplestreams_0.1.0-30-g3cc8988a-0ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading simplestreams_0.1.0-30-g3cc8988a-0ubuntu1.dsc: done.
  Uploading simplestreams_0.1.0-30-g3cc8988a.orig.tar.gz: done.
  Uploading simplestreams_0.1.0-30-g3cc8988a-0ubuntu1.debian.tar.xz: done.
  Uploading simplestreams_0.1.0-30-g3cc8988a-0ubuntu1_source.buildinfo: done.
  Uploading simplestreams_0.1.0-30-g3cc8988a-0ubuntu1_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 41e1af5..a0a278e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+simplestreams (0.1.0-30-g3cc8988a-0ubuntu1) focal; urgency=medium
+
+  * New upstream snapshot.
+    - tools/js2signed: change shebang to /usr/bin/env python3
+    - Fix file matching for disk-kvm.img [Stéphane Graber]
+    - Add combined-disk-kvm-img_sha256 to download.json [Stéphane Graber]
+    - debian: run the tests only against Python 3 [Paride Legovini]
+    - debian: stop building Python 2 package
+
+ -- Daniel Watkins <[e-mail]>  Thu, 05 Dec 2019 10:51:04 -0500
+
 simplestreams (0.1.0-25-gba75825b-0ubuntu1) eoan; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/control b/debian/control
index 350b2d0..d6fc372 100644
--- a/debian/control
+++ b/debian/control
@@ -5,15 +5,6 @@ Standards-Version: 4.2.1
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 7),
                dh-python,
-               python-all,
-               python-glanceclient,
-               python-keystoneclient,
-               python-mock,
-               python-nose,
-               python-requests (>= 1.1),
-               python-setuptools,
-               python-swiftclient,
-               python-yaml,
                python3,
                python3-flake8,
                python3-glanceclient,
@@ -46,15 +37,6 @@ Description: Library and tools for using Simple Streams data
  This package provides a client for interacting with simple
  streams data as is produced to describe Ubuntu's cloud images.
 
-Package: python-simplestreams
-Architecture: all
-Priority: optional
-Depends: gnupg, python-boto, ${misc:Depends}, ${python:Depends}
-Suggests: python-requests (>= 1.1)
-Description: Library and tools for using Simple Streams data
- This package provides a client for interacting with simple
- streams data as is produced to describe Ubuntu's cloud images.
-
 Package: python3-simplestreams-openstack
 Architecture: all
 Priority: optional
diff --git a/debian/python-simplestreams.install b/debian/python-simplestreams.install
deleted file mode 100644
index 0236cd1..0000000
--- a/debian/python-simplestreams.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2*/*-packages/simplestreams/*
diff --git a/debian/rules b/debian/rules
index bc93943..3e02246 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,16 @@
 #!/usr/bin/make -f
 
 export SS_REQUIRE_DISTRO_INFO = 0
-PYVERS := $(shell pyversions -r)
 PY3VERS := $(shell py3versions -r)
 %:
-	dh $@ --with=python2,python3
+	dh $@ --with=python3
 
 override_dh_auto_install:
 	dh_auto_install
-	set -ex; for python in $(PY3VERS) $(PYVERS); do \
+	set -ex; for python in $(PY3VERS); do \
 		$$python setup.py build --executable=/usr/bin/python3 && \
 		$$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
 	done
+
+override_dh_auto_test:
+	make test3
diff --git a/tools/js2signed b/tools/js2signed
index b02054b..2b66e5f 100755
--- a/tools/js2signed
+++ b/tools/js2signed
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #   Copyright (C) 2013 Canonical Ltd.
 #
 #   Author: Scott Moser <[e-mail]>
diff --git a/tools/make-test-data b/tools/make-test-data
index a1e183d..7a39843 100755
--- a/tools/make-test-data
+++ b/tools/make-test-data
@@ -298,8 +298,10 @@ def create_fake_file(prefix, item):
     # - combined_sha256 and combined_rootxz_sha256 for the -root.tar.gz
     # - combined_squashfs_sha256 for the squashfs
     # - combined_disk1-img_sha256 for the img
+    # - combined_disk-kvm-img_sha256 for the img
     ftype = item['ftype']
     for name, extension in (('disk1-img', '.img'),
+                            ('disk-kvm-img', 'disk-kvm.img'),
                             ('rootxz', '-root.tar.xz'),
                             ('squashfs', '.squashfs')):
         if (ftype == "lxd.tar.xz" and
@@ -570,6 +572,7 @@ def create_image_data(query_tree, out_d, streamdir):
 
             # find calculated combined checksums
             for name, extension in (('disk1-img', '.img'),
+                                    ('disk-kvm-img', 'disk-kvm.img'),
                                     ('rootxz', '-root.tar.xz'),
                                     ('squashfs', '.squashfs')):
                 root = lxd.replace('-lxd.tar.xz', extension)
diff --git a/tools/sign-examples b/tools/sign-examples
index 9b549d2..89d5dd8 100755
--- a/tools/sign-examples
+++ b/tools/sign-examples
@@ -6,4 +6,4 @@ FILES=( ${TOP_DIR}/examples/*/streams/v1/*.json )
 force=""
 [ "$1" = "--force" ] && force="$1"
 
-"${TOP_DIR}/tools/js2signed" $force "${FILES[@]}"
+$SS_PYTHON "${TOP_DIR}/tools/js2signed" $force "${FILES[@]}"
diff --git a/tox.ini b/tox.ini
index 654652e..3c8634f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ envlist = py27, py3, flake8
 [testenv]
 setenv =
    GNUPGHOME={toxinidir}/gnupg
+   SS_PYTHON={envpython}
 commands = 
     {toxinidir}/tools/create-gpgdir
     {toxinidir}/tools/sign-examples