Merge simplestreams:drop-py2-packages into simplestreams:master

[Dan Watkins]

debian: stop building Python 2 package

[Dan Watkins (oddbloke)]

debian: stop building Python 2 package

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:55f1995292ac0f5088748bf662dee46b85d10a09
https://jenkins.ubuntu.com/server/job/simplestreams-ci/104/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/104/
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/104/
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/104/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/104//rebuild

review: Needs Fixing (continuous-integration)

[Rafael David Tinoco (rafaeldtinoco)]

Alright, so... in commit:

commit 385a037
Author: Daniel Watkins <email address hidden>
Date: Tue Aug 20 14:42:26 2019

    d/control: remove python-simplestreams-openstack

    It's empty after build, and we're moving away from Python 2 so remove it
    instead of attempting to address the issue.

diff --git a/debian/control b/debian/control
index 6cd458d..350b2d0 100644
--- a/debian/control
+++ b/debian/control
@@ -55,19 +55,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-openstack
-Architecture: all
-Priority: optional
-Depends: python-glanceclient,
- python-keystoneclient,
- python-simplestreams,
- python-swiftclient,
- ${misc:Depends}
-Description: Library and tools for using Simple Streams data
- This package depends on libraries necessary to use the openstack dependent
- functionality in simplestreams. That includes interacting with glance,
- swift and keystone.

you're removing the package but you still keep install file in debian/:

python3-simplestreams-openstack.install

should it be removed in this commit as well ?

[Rafael David Tinoco (rafaeldtinoco)]

Same question for:

commit 55f1995 (HEAD -> drop-py2-packages, origin/drop-py2-packages)
Author: Daniel Watkins <email address hidden>
Date: Mon Sep 16 15:28:01 2019

    debian: stop building python-simplestreams

should we remove debian/python-simplestreams.install as well ?

[Dan Watkins (oddbloke)]

We should, let me fix that!

[Rafael David Tinoco (rafaeldtinoco)]

From the ci error,

should tox drop the python 2 dependency also ?

[Dan Watkins (oddbloke)]

Actually, in that first case that's for the Python 3 -simplestreams-openstack which we still build. I've force-pushed the removal of python-simplestreams.install.

[Dan Watkins (oddbloke)]

We aren't (yet) dropping Python 2 from upstream, just from the packaging, so I think it needs to stay in tox. Those errors look like a broken test platform to me, rather than anything that changing the packaging would cause.

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:2db6fbf17d280ca667470e258dc3a0b50c17568d
https://jenkins.ubuntu.com/server/job/simplestreams-ci/105/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/105/
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/105/
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/105/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/105//rebuild

review: Needs Fixing (continuous-integration)

[Rafael David Tinoco (rafaeldtinoco)]

Alright, the changes look okay to me:

----
dpkg-deb: building package 'simplestreams' in '../simplestreams_0.1.0-28-g2db6fbf1-0ubuntu1_all.deb'.
dpkg-deb: building package 'python3-simplestreams' in '../python3-simplestreams_0.1.0-28-g2db6fbf1-0ubuntu1_all.deb'.
dpkg-deb: building package 'python3-simplestreams-openstack' in '../python3-simplestreams-openstack_0.1.0-28-g2db6fbf1-0ubuntu1_all.deb'.
 dpkg-genbuildinfo
 dpkg-genchanges >../simplestreams_0.1.0-28-g2db6fbf1-0ubuntu1_amd64.changes
dpkg-genchanges: info: including full source code in upload
 dpkg-source --after-build .
dpkg-buildpackage: info: full upload (original source is included)
Now running lintian simplestreams_0.1.0-28-g2db6fbf1-0ubuntu1_amd64.changes ...
W: simplestreams: binary-without-manpage usr/bin/json2streams
W: simplestreams: binary-without-manpage usr/bin/sstream-mirror
W: simplestreams: binary-without-manpage usr/bin/sstream-query
W: simplestreams: binary-without-manpage usr/bin/sstream-sync
W: python3-simplestreams-openstack: binary-without-manpage usr/bin/sstream-mirror-glance
Finished running lintian.
wrote python3-simplestreams-openstack_0.1.0-28-g2db6fbf1-0ubuntu1_all.deb
wrote python3-simplestreams_0.1.0-28-g2db6fbf1-0ubuntu1_all.deb
wrote simplestreams_0.1.0-28-g2db6fbf1-0ubuntu1.debian.tar.xz
wrote simplestreams_0.1.0-28-g2db6fbf1-0ubuntu1.dsc
wrote simplestreams_0.1.0-28-g2db6fbf1-0ubuntu1_all.deb
wrote simplestreams_0.1.0-28-g2db6fbf1-0ubuntu1_amd64.build
wrote simplestreams_0.1.0-28-g2db6fbf1-0ubuntu1_amd64.buildinfo
wrote simplestreams_0.1.0-28-g2db6fbf1-0ubuntu1_amd64.changes
wrote simplestreams_0.1.0-28-g2db6fbf1.orig.tar.gz
----

Package generation in focal is good, changes are related to packaging only. Keeping or not that .install file is a maintainer choice, so no issue there.

----

$ dpkg -l | grep -i simplestre
ii python3-simplestreams 0.1.0-28-g2db6fbf1-0ubuntu1 all Library and tools for using Simple Streams data
ii python3-simplestreams-openstack 0.1.0-28-g2db6fbf1-0ubuntu1 all Library and tools for using Simple Streams data
ii simplestreams 0.1.0-28-g2db6fbf1-0ubuntu1 all Library and tools for using Simple Streams data

----

Dependencies are fine with latest Focal...

----

(c)rafaeldtinoco@ubuntu:~$ dpkg -L python3-simplestreams-openstack
/.
/usr
/usr/bin
/usr/bin/sstream-mirror-glance
/usr/share
/usr/share/doc
/usr/share/doc/python3-simplestreams-openstack
/usr/share/doc/python3-simplestreams-openstack/changelog.Debian.gz
/usr/share/doc/python3-simplestreams-openstack/copyright

$ dpkg -L python3-simplestreams
/.
/usr
/usr/lib
/usr/lib/python3
/usr/lib/python3/dist-packages
/usr/lib/python3/dist-packages/simplestreams
/usr/lib/python3/dist-packages/simplestreams/__init__.py
/usr/lib/python3/dist-packages/simplestreams/checksum_util.py
/usr/lib/python3/dist-packages/simplestreams/contentsource.py
/usr/lib/python3/dist-packages/simplestreams/filters.py
/usr/lib/python3/dist-packages/simplestreams/generate_simplestreams.py
/usr/lib/python3/dist-packages/simplestreams/json2streams.py
/usr/lib/python3/dist-packages/simplestreams/log.py
/usr/lib...

review: Approve

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:2db6fbf17d280ca667470e258dc3a0b50c17568d
https://jenkins.ubuntu.com/server/job/simplestreams-ci/106/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/106/
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/106/
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/106/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/106//rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:2db6fbf17d280ca667470e258dc3a0b50c17568d
https://jenkins.ubuntu.com/server/job/simplestreams-ci/107/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/107/
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/107/
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/107/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/107//rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

It looks like this didn't fully work.
You missed some references to python2.

https://launchpad.net/~simplestreams-dev/+archive/ubuntu/trunk/+build/18160048

looks like:
 * tests/httpserver.py (although i think this is only called by uniti tests, and called sys.executable)
 * tools/js2signed: this gets called from sign-examples (examples-sign target in make).
 * tools/make-test-data: used by make exdata

i think the first thing i'd try is the obvious:
 http://paste.ubuntu.com/p/4bNjgdBwmd/

diff --git a/debian/control b/debian/control
index 6cd458d..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,28 +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: python-simplestreams-openstack
-Architecture: all
-Priority: optional
-Depends: python-glanceclient,
-         python-keystoneclient,
-         python-simplestreams,
-         python-swiftclient,
-         ${misc:Depends}
-Description: Library and tools for using Simple Streams data
- This package depends on libraries necessary to use the openstack dependent
- functionality in simplestreams.  That includes interacting with glance,
- swift and keystone.
-
 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..9cb75fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,13 @@
 #!/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