Merge lp:~jelmer/byoci/setuptools into lp:byoci

[Jelmer Vernooij]

Install setuptools from apt.

Install setuptools from apt.

The version of setuptools in pip no longer supports Python 2, and
so any builds that try to build Breezy on Python 2 fail.

See for example https://ci.breezy-vcs.org/job/brz/job/brz-land/737/console

[Vincent Ladeuil (vila)]

This should go into the breezy byov.conf ;-)

Granted, containers/byov.conf should be cleaned up to avoid such confusion, but it's only there to provide default values that can and should be defined in the projects themselves.

review: Needs Fixing

Unmerged revisions

221. By Jelmer Vernooij on 2020-05-28

Install setuptools from apt.

The version of setuptools in pip no longer supports Python 2.

=== modified file 'containers/byov.conf'
--- containers/byov.conf	2018-09-15 17:18:11 +0000
+++ containers/byov.conf	2020-05-28 21:47:08 +0000
@@ -36,8 +36,8 @@
 
 # FIXME: Arguably this should be vm.build_deps=brz but it requires either an
 # available package or at least a debian/ dir ? -- vila 2018-02-23
-brz.build_deps = gcc, debhelper, python, python-all-dev, python3-all-dev, python-configobj, python3-configobj, python-docutils, python3-docutils, python-paramiko, python3-paramiko, python-subunit, python3-subunit, python-testtools, python3-testtools, subunit, cython, cython3, python-fastimport
-subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtools, python3-testtools
+brz.build_deps = gcc, debhelper, python, python-all-dev, python3-all-dev, python-configobj, python3-configobj, python-docutils, python3-docutils, python-paramiko, python3-paramiko, python-subunit, python3-subunit, python-testtools, python3-testtools, subunit, cython, cython3, python-fastimport, python-setuptools
+subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtools, python3-testtools, python3-setuptools
 vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, python-junitxml
 [brz-xenial]
 vm.release = xenial