Breezy

Merge lp:~jelmer/brz/install-fastimport into lp:brz

  1. install-fastimport
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Martin Packman
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/install-fastimport
Merge into: lp:brz
Diff against target: 61 lines (+8/-5)
3 files modified
byov.conf (+7/-3)
python3.flapping (+1/-0)
python3.passing (+0/-2)
To merge this branch: bzr merge lp:~jelmer/brz/install-fastimport
Reviewer Review Type Date Requested Status
Martin Packman Approve
Vincent Ladeuil Approve
Review via email: mp+351376@code.launchpad.net

Description of the change

Install fastimport from git rather than from the Ubuntu package.

This allows installing the python3 version.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

https://ci.breezy-vcs.org/job/brz-devs-test/ turned green, care to update here ?

Revision history for this message
Vincent Ladeuil (vila) wrote :

Good !

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Voting criteria not met
https://ci.breezy-vcs.org/job/land-brz/362/

Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Voting criteria not met
https://ci.breezy-vcs.org/job/land-brz/363/

Revision history for this message
Martin Packman (gz) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'byov.conf'
2--- byov.conf 2018-05-24 08:15:15 +0000
3+++ byov.conf 2018-07-27 09:38:01 +0000
4@@ -6,8 +6,12 @@
5 dulwich.install = (cd ../dulwich.git && ./setup.py install --user)
6 dulwich.install3 = (cd ../dulwich.git && python3 ./setup.py install --user)
7 subunit.clone = (git clone https://github.com/testing-cabal/subunit.git ../subunit)
8+fastimport.clone = (git clone git://jelmer.uk/python-fastimport.git ../fastimport.git)
9+fastimport.install = (cd ../fastimport.git && ./setup.py install --user)
10+fastimport.install3 = (cd ../fastimport.git && python3 ./setup.py install --user)
11+
12 [brz]
13-# FIXME: python3-fastimport requires >= artful :-/ and we're stuck on xenial
14+# FIXME: we're stuck on xenial
15 # because paramiko 2.0.0 is broken:
16 # breezy.tests.test_transport.TestSSHConnections.test_bzr_connect_to_bzr_ssh
17 # runs into a deprecation issue which is only fixed in 2.3.0 which is
18@@ -17,12 +21,12 @@
19
20 # FIXME: Arguably this should be vm.build_deps=brz but it requires either an
21 # available package or at least a debian/ dir ? -- vila 2018-02-23
22-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
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
24 subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtools, python3-testtools
25 vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml
26 [brz-xenial]
27 vm.release = xenial
28-byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {dulwich.install3} && {subunit.clone})
29+byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {dulwich.install3} && {fastimport.clone} && {fastimport.install} && {fastimport.install3} && {subunit.clone})
30 # FIXME: bzr log -l2 should be by default -- vila 2018-03-09
31 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit"
32 [brz-xenial-py3]
33
34=== modified file 'python3.flapping'
35--- python3.flapping 2018-07-25 21:12:47 +0000
36+++ python3.flapping 2018-07-27 09:38:01 +0000
37@@ -38,3 +38,4 @@
38 breezy.tests.blackbox.test_status.BranchStatus.test_status_multiple_nonexistent_files
39 breezy.tests.blackbox.test_status.BranchStatus.test_status_nonexistent_file_with_others
40 breezy.tests.test_transform.TestSerializeTransform.test_serialize_creation
41+breezy.plugins.git.tests.test_fetch.LocalRepositoryFetchTests.test_dir_becomes_symlink
42
43=== modified file 'python3.passing'
44--- python3.passing 2018-07-25 21:22:37 +0000
45+++ python3.passing 2018-07-27 09:38:01 +0000
46@@ -497,7 +497,6 @@
47 breezy.plugins.git.tests.test_fetch.ImportObjects.test_import_tree_with_unusual_mode_file
48 breezy.plugins.git.tests.test_fetch.LocalRepositoryFetchTests.test_becomes_executable
49 breezy.plugins.git.tests.test_fetch.LocalRepositoryFetchTests.test_changing_symlink
50-breezy.plugins.git.tests.test_fetch.LocalRepositoryFetchTests.test_dir_becomes_symlink
51 breezy.plugins.git.tests.test_fetch.LocalRepositoryFetchTests.test_empty
52 breezy.plugins.git.tests.test_fetch.LocalRepositoryFetchTests.test_executable
53 breezy.plugins.git.tests.test_fetch.LocalRepositoryFetchTests.test_incremental
54@@ -28647,7 +28646,6 @@
55 breezy.tests.test_transform.TestSerializeTransform.test_get_parents_lines
56 breezy.tests.test_transform.TestSerializeTransform.test_get_parents_texts
57 breezy.tests.test_transform.TestSerializeTransform.test_serialize_add_contents
58-breezy.tests.test_transform.TestSerializeTransform.test_serialize_creation
59 breezy.tests.test_transform.TestSerializeTransform.test_serialize_destruction
60 breezy.tests.test_transform.TestSerializeTransform.test_serialize_kind_change
61 breezy.tests.test_transform.TestSerializeTransform.test_serialize_missing

Subscribers

People subscribed via source and target branches