Merge lp:~jelmer/brz/merge-3.1-fix-build into lp:brz

[Jelmer Vernooij]

Merge lp:brz/3.1.

Merge lp:brz/3.1.

[Jelmer Vernooij (jelmer)]

review: Approve

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

Project setup failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/804/

=== modified file 'byov.conf'
--- byov.conf	2020-07-28 02:11:05 +0000
+++ byov.conf	2021-02-19 03:14:53 +0000
@@ -2,18 +2,12 @@
 # Start with an up to date system by default
 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 && 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 && 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)
+flake8.install3 = (pip3 install flake8)
+brz.extras = fastimport,launchpad,workspace,git,cext,doc
 
 [brz]
-# FIXME: we're stuck on xenial
 # because paramiko 2.0.0 is broken:
 # breezy.tests.test_transport.TestSSHConnections.test_bzr_connect_to_bzr_ssh
 # runs into a deprecation issue which is only fixed in 2.3.0 which is
@@ -27,12 +21,10 @@
 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} && {fastimport.clone} && {fastimport.install} && {subunit.clone} && {flake8.install} && {patiencediff.install} && {sphinx_epytext.install} && {cython.install})
+vm.release = bionic
+byoci.setup.command = (pip3 install --upgrade pip && pip3 install --upgrade cython sphinx paramiko && {subunit.clone} && {flake8.install3} && python3 setup.py develop --user && pip3 install -e '.[{brz.extras}]')
 # 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]
-vm.release = bionic
 [brz-cosmic]
 vm.release = cosmic
 [brz-disco]

=== modified file 'setup.py'
--- setup.py	2020-08-22 22:46:24 +0000
+++ setup.py	2021-02-19 03:14:53 +0000
@@ -71,10 +71,12 @@
         'dulwich<0.20,>=0.19.12;python_version<"3.0"',
         ],
     'extras_require': {
-        'fastimport': [],
+        'cext': ['cython>=0.29'],
+        'fastimport': ['fastimport'],
         'git': [],
         'launchpad': ['launchpadlib>=1.6.3'],
         'workspace': ['pyinotify'],
+        'doc': ['setuptools<45;python_version<"3.0"', 'sphinx==1.8.5;python_version<"3.0"', 'sphinx_epytext'],
         },
     'tests_require': [
         'testtools',