Merge lp:~jelmer/brz/byov-no-py3 into lp:brz

[Jelmer Vernooij]

Drop python 2 dependencies in byoci.

Drop python 2 dependencies.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/738/

[lp:~jelmer/brz/byov-no-py3]

7504. By Jelmer Vernooij on 2020-05-29

Drop '3' suffix.

7505. By Jelmer Vernooij on 2020-05-29

Skip flake8 where broken.

=== modified file 'breezy/tests/test_source.py'
--- breezy/tests/test_source.py	2020-02-18 01:57:45 +0000
+++ breezy/tests/test_source.py	2020-05-29 17:47:46 +0000
@@ -332,6 +332,7 @@
         new_path.insert(
             0, os.path.join(os.path.dirname(__file__), '..', '..', 'tools'))
         self.overrideAttr(sys, 'path', new_path)
+        import argparse
         from flake8.main.application import Application
         from flake8.formatting.base import BaseFormatter
         app = Application()
@@ -352,8 +353,11 @@
             def handle(self, error):
                 self.errors.append(error)
 
+        try:
+            app.initialize([])
+        except argparse.ArgumentError as e:
+            self.skipTest('broken flake8: %r' % e)
         app.formatter = Formatter()
-        app.initialize([])
         app.run_checks()
         app.report()
         self.assertEqual(app.formatter.errors, [])

=== modified file 'byov.conf'
--- byov.conf	2019-10-13 22:53:02 +0000
+++ byov.conf	2020-05-29 17:47:46 +0000
@@ -3,20 +3,14 @@
 vm.update = True
 # External sources dependencies, packages are not recent enough
 dulwich.clone = (git clone git://jelmer.uk/dulwich ../dulwich.git)
-dulwich.install = (cd ../dulwich.git && ./setup.py install --user)
-dulwich.install3 = (cd ../dulwich.git && python3 ./setup.py install --user)
+dulwich.install = (cd ../dulwich.git && python3 ./setup.py install --user)
 subunit.clone = (git clone https://github.com/testing-cabal/subunit.git ../subunit)
 fastimport.clone = (git clone git://jelmer.uk/python-fastimport.git ../fastimport.git)
-fastimport.install = (cd ../fastimport.git && ./setup.py install --user)
-fastimport.install3 = (cd ../fastimport.git && python3 ./setup.py install --user)
-sphinx_epytext.install = (pip install sphinx==1.8.5 sphinx_epytext)
-sphinx_epytext.install3 = (pip3 install sphinx_epytext)
-flake8.install = (pip install flake8)
-flake8.install3 = (pip3 install flake8)
-patiencediff.install = (pip install patiencediff)
-patiencediff.install3 = (pip3 install patiencediff)
-cython.install = (pip install cython)
-cython.install3 = (pip3 install cython)
+fastimport.install = (cd ../fastimport.git && python3 ./setup.py install --user)
+sphinx_epytext.install = (pip3 install sphinx_epytext)
+flake8.install = (pip3 install flake8)
+patiencediff.install = (pip3 install patiencediff)
+cython.install = (pip3 install cython)
 
 [brz]
 # FIXME: we're stuck on xenial
@@ -29,12 +23,12 @@
 
 # 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, python-pip, python3-pip, python-setuptools, python3-setuptools, python-flake8, python3-flake8, python-sphinx, python3-sphinx, python-launchpadlib, python3-launchpadlib
-subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtools, python3-testtools, cython, cython3, quilt
+brz.build_deps = gcc, debhelper, python3, python3-all-dev, python3-configobj, python3-docutils, python3-paramiko, python3-subunit, python3-testtools, subunit, python3-pip, python3-setuptools, python3-flake8, python3-sphinx, python3-launchpadlib
+subunit.build_deps = python3-testscenarios, python3-testtools, cython, cython3, quilt
 vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml
 [brz-xenial]
 vm.release = xenial
-byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {dulwich.install3} && {fastimport.clone} && {fastimport.install} && {fastimport.install3} && {subunit.clone} && {flake8.install} && {flake8.install3} && {patiencediff.install} && {patiencediff.install3} && {sphinx_epytext.install} && {sphinx_epytext.install3} && {cython.install} && {cython.install3})
+byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {fastimport.clone} && {fastimport.install} && {subunit.clone} && {flake8.install} && {patiencediff.install} && {sphinx_epytext.install} && {cython.install})
 # FIXME: bzr log -l2 should be by default -- vila 2018-03-09
 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit"
 [brz-bionic]
@@ -43,8 +37,8 @@
 vm.release = cosmic
 [brz-disco]
 vm.release = disco
-vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-dulwich, python3-dulwich, python-junitxml
-byoci.setup.command = ({subunit.clone} && {sphinx_epytext.install} && {sphinx_epytext.install3} )
+vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python3-dulwich, python-junitxml
+byoci.setup.command = ({subunit.clone} && {sphinx_epytext.install} )
 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"
 [brz-eoan]
 vm.release = eoan
@@ -52,8 +46,8 @@
 [brz-buster]
 vm.distribution = debian
 vm.release = buster
-vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-dulwich, python3-dulwich, python-junitxml
-byoci.setup.command = ({subunit.clone} && {sphinx_epytext.install} && {sphinx_epytext.install3} )
+vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python3-dulwich, python-junitxml
+byoci.setup.command = ({subunit.clone} && {sphinx_epytext.install} )
 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"
 [brz-sid]
 vm.distribution = debian