diff -Nru simplestreams-0.1.0-25-gba75825b/debian/changelog simplestreams-0.1.0-30-g3cc8988a/debian/changelog --- simplestreams-0.1.0-25-gba75825b/debian/changelog 2019-08-20 16:52:03.000000000 +0000 +++ simplestreams-0.1.0-30-g3cc8988a/debian/changelog 2019-12-05 15:51:04.000000000 +0000 @@ -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 Thu, 05 Dec 2019 10:51:04 -0500 + simplestreams (0.1.0-25-gba75825b-0ubuntu1) eoan; urgency=medium * New upstream snapshot. diff -Nru simplestreams-0.1.0-25-gba75825b/debian/control simplestreams-0.1.0-30-g3cc8988a/debian/control --- simplestreams-0.1.0-25-gba75825b/debian/control 2019-08-20 16:52:03.000000000 +0000 +++ simplestreams-0.1.0-30-g3cc8988a/debian/control 2019-12-05 15:51:04.000000000 +0000 @@ -5,15 +5,6 @@ Maintainer: Ubuntu Developers 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, @@ -45,15 +36,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 diff -Nru simplestreams-0.1.0-25-gba75825b/debian/python-simplestreams.install simplestreams-0.1.0-30-g3cc8988a/debian/python-simplestreams.install --- simplestreams-0.1.0-25-gba75825b/debian/python-simplestreams.install 2019-08-20 16:52:03.000000000 +0000 +++ simplestreams-0.1.0-30-g3cc8988a/debian/python-simplestreams.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/python2*/*-packages/simplestreams/* diff -Nru simplestreams-0.1.0-25-gba75825b/debian/rules simplestreams-0.1.0-30-g3cc8988a/debian/rules --- simplestreams-0.1.0-25-gba75825b/debian/rules 2019-08-20 16:52:03.000000000 +0000 +++ simplestreams-0.1.0-30-g3cc8988a/debian/rules 2019-12-05 15:51:04.000000000 +0000 @@ -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 -Nru simplestreams-0.1.0-25-gba75825b/tools/js2signed simplestreams-0.1.0-30-g3cc8988a/tools/js2signed --- simplestreams-0.1.0-25-gba75825b/tools/js2signed 2019-08-19 17:00:00.000000000 +0000 +++ simplestreams-0.1.0-30-g3cc8988a/tools/js2signed 2019-12-04 21:59:45.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2013 Canonical Ltd. # # Author: Scott Moser diff -Nru simplestreams-0.1.0-25-gba75825b/tools/make-test-data simplestreams-0.1.0-30-g3cc8988a/tools/make-test-data --- simplestreams-0.1.0-25-gba75825b/tools/make-test-data 2019-08-19 17:00:00.000000000 +0000 +++ simplestreams-0.1.0-30-g3cc8988a/tools/make-test-data 2019-12-04 21:59:45.000000000 +0000 @@ -298,8 +298,10 @@ # - 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 @@ # 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 -Nru simplestreams-0.1.0-25-gba75825b/tools/sign-examples simplestreams-0.1.0-30-g3cc8988a/tools/sign-examples --- simplestreams-0.1.0-25-gba75825b/tools/sign-examples 2019-08-19 17:00:00.000000000 +0000 +++ simplestreams-0.1.0-30-g3cc8988a/tools/sign-examples 2019-12-04 21:59:45.000000000 +0000 @@ -6,4 +6,4 @@ force="" [ "$1" = "--force" ] && force="$1" -"${TOP_DIR}/tools/js2signed" $force "${FILES[@]}" +$SS_PYTHON "${TOP_DIR}/tools/js2signed" $force "${FILES[@]}" diff -Nru simplestreams-0.1.0-25-gba75825b/tox.ini simplestreams-0.1.0-30-g3cc8988a/tox.ini --- simplestreams-0.1.0-25-gba75825b/tox.ini 2019-08-19 17:00:00.000000000 +0000 +++ simplestreams-0.1.0-30-g3cc8988a/tox.ini 2019-12-04 21:59:45.000000000 +0000 @@ -4,6 +4,7 @@ [testenv] setenv = GNUPGHOME={toxinidir}/gnupg + SS_PYTHON={envpython} commands = {toxinidir}/tools/create-gpgdir {toxinidir}/tools/sign-examples