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

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 7531
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/merge-3.1-fix-build
Merge into: lp:brz
Diff against target: 57 lines (+7/-13)
2 files modified
byov.conf (+4/-12)
setup.py (+3/-1)
To merge this branch: bzr merge lp:~jelmer/brz/merge-3.1-fix-build
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+398324@code.launchpad.net

Commit message

Merge lp:brz/3.1.

Description of the change

Merge lp:brz/3.1.

To post a comment you must log in.
Jelmer Vernooij (jelmer) :
review: Approve
lp:~jelmer/brz/merge-3.1-fix-build updated
7531. By Jelmer Vernooij on 2021-02-19

FIx syntax.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
2# Start with an up to date system by default2# Start with an up to date system by default
3vm.update = True3vm.update = True
4# External sources dependencies, packages are not recent enough4# External sources dependencies, packages are not recent enough
5dulwich.clone = (git clone git://jelmer.uk/dulwich ../dulwich.git)
6dulwich.install = (cd ../dulwich.git && python3 ./setup.py install --user)
7subunit.clone = (git clone https://github.com/testing-cabal/subunit.git ../subunit)5subunit.clone = (git clone https://github.com/testing-cabal/subunit.git ../subunit)
8fastimport.clone = (git clone git://jelmer.uk/python-fastimport.git ../fastimport.git)
9fastimport.install = (cd ../fastimport.git && python3 ./setup.py install --user)
10sphinx_epytext.install = (pip3 install sphinx_epytext)6sphinx_epytext.install = (pip3 install sphinx_epytext)
11flake8.install = (pip3 install flake8)7flake8.install3 = (pip3 install flake8)
12patiencediff.install = (pip3 install patiencediff)8brz.extras = fastimport,launchpad,workspace,git,cext,doc
13cython.install = (pip3 install cython)
149
15[brz]10[brz]
16# FIXME: we're stuck on xenial
17# because paramiko 2.0.0 is broken:11# because paramiko 2.0.0 is broken:
18# breezy.tests.test_transport.TestSSHConnections.test_bzr_connect_to_bzr_ssh12# breezy.tests.test_transport.TestSSHConnections.test_bzr_connect_to_bzr_ssh
19# runs into a deprecation issue which is only fixed in 2.3.0 which is13# runs into a deprecation issue which is only fixed in 2.3.0 which is
@@ -27,12 +21,10 @@
27subunit.build_deps = python3-testscenarios, python3-testtools, cython, cython3, quilt21subunit.build_deps = python3-testscenarios, python3-testtools, cython, cython3, quilt
28vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml22vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml
29[brz-xenial]23[brz-xenial]
30vm.release = xenial24vm.release = bionic
31byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {fastimport.clone} && {fastimport.install} && {subunit.clone} && {flake8.install} && {patiencediff.install} && {sphinx_epytext.install} && {cython.install})25byoci.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}]')
32# FIXME: bzr log -l2 should be by default -- vila 2018-03-0926# FIXME: bzr log -l2 should be by default -- vila 2018-03-09
33byoci.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"27byoci.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"
34[brz-bionic]
35vm.release = bionic
36[brz-cosmic]28[brz-cosmic]
37vm.release = cosmic29vm.release = cosmic
38[brz-disco]30[brz-disco]
3931
=== 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 @@
71 'dulwich<0.20,>=0.19.12;python_version<"3.0"',71 'dulwich<0.20,>=0.19.12;python_version<"3.0"',
72 ],72 ],
73 'extras_require': {73 'extras_require': {
74 'fastimport': [],74 'cext': ['cython>=0.29'],
75 'fastimport': ['fastimport'],
75 'git': [],76 'git': [],
76 'launchpad': ['launchpadlib>=1.6.3'],77 'launchpad': ['launchpadlib>=1.6.3'],
77 'workspace': ['pyinotify'],78 'workspace': ['pyinotify'],
79 'doc': ['setuptools<45;python_version<"3.0"', 'sphinx==1.8.5;python_version<"3.0"', 'sphinx_epytext'],
78 },80 },
79 'tests_require': [81 'tests_require': [
80 'testtools',82 'testtools',

Subscribers

People subscribed via source and target branches