Merge lp:~jelmer/brz-debian/setup into lp:brz-debian

[Jelmer Vernooij]

Fix byov setup: Install setuptools.

Install setuptools.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Merging failed
https://ci.breezy-vcs.org/job/brz-debian/job/brz-debian-land/5723/

Unmerged revisions

1233. By Jelmer Vernooij on 2020-11-28

Upgrade to fossa.

1232. By Jelmer Vernooij on 2020-11-28

Install debmutate.

1231. By Jelmer Vernooij on 2020-11-28

Install debmutate.

1230. By Jelmer Vernooij on 2020-11-28

Avoid typing.

1229. By Jelmer Vernooij on 2020-11-28

Typo.

1228. By Jelmer Vernooij on 2020-11-28

Install patiencediff.

1227. By Jelmer Vernooij on 2020-11-28

Install pip.

1226. By Jelmer Vernooij on 2020-11-28

Install cython.

1225. By Jelmer Vernooij on 2020-11-28

Build against lp:brz/3.1.

1224. By Jelmer Vernooij on 2020-11-28

Install older dulwich.

=== modified file 'byov.conf'
--- byov.conf	2018-10-10 22:35:39 +0000
+++ byov.conf	2020-11-28 13:33:24 +0000
@@ -3,19 +3,22 @@
 # 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 && ./setup.py install --user)
-dulwich3.install = (cd ../dulwich.git && python3 ./setup.py install --user)
+dulwich.clone = (git clone git://jelmer.uk/dulwich -b 0.19 ../dulwich-0.19.git)
+dulwich.clone3 = (git clone git://jelmer.uk/dulwich ../dulwich.git)
+dulwich.install = (cd ../dulwich-0.19.git && ./setup.py install --user)
+dulwich.install3 = (cd ../dulwich.git && python3 ./setup.py install --user)
+cython.install = (pip install cython)
+cython.install3 = (pip3 install cython)
+patiencediff.install = (pip install patiencediff)
+patiencediff3.install = (pip3 install patiencediff)
+debmutate3.install = (pip3 install debmutate)
 
 [brz-plugin-debian]
-vm.release = xenial
-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-dulwich
+vm.release = fossa
+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-fastimport, python-dulwich, python3-setuptools, python-setuptools, python-pip, python3-pip
 debian.build_deps = python-debian, python-apt, dpkg-dev, fakeroot, devscripts, patchutils, pristine-tar, quilt, python-lzma, libalgorithm-merge-perl, python-yaml, python-distro-info, python3-distro-info, python3-apt, python3-yaml, python3-debian
 vm.packages = {brz.build_deps}, {debian.build_deps}, {debian.test_deps}, bzr, python-debian, python-junitxml
-brz.branch = (bzr branch lp:brz ../brz-trunk)
+brz.branch = (bzr branch lp:brz/3.1 ../brz-trunk)
 brz.make = (cd ../brz-trunk && make)
-byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {brz.branch} && {brz.make})
-byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (BRZ_PLUGINS_AT=debian@`pwd` BRZ_PLUGIN_PATH=-site:-user python2 ../brz-trunk/brz selftest -v  --parallel=fork --subunit2 | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"
-[brz-plugin-debian-py3]
-byoci.setup.command = ({dulwich.clone} && {dulwich3.install} && {brz.branch} && {brz.make})
+byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {dulwich.clone3} && {dulwich.install3} && {cython.install} && {cython.install3} && {patiencediff.install} && {patiencediff3.install} && {debmutate3.install} && {brz.branch} && {brz.make})
 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (BRZ_PLUGINS_AT=debian@`pwd` BRZ_PLUGIN_PATH=-site:-user python3 ../brz-trunk/brz selftest -v  --parallel=fork --subunit2 | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"

=== modified file 'bzrtools_import.py'
--- bzrtools_import.py	2020-11-21 03:31:58 +0000
+++ bzrtools_import.py	2020-11-28 13:33:24 +0000
@@ -5,11 +5,7 @@
 
 from __future__ import absolute_import
 
-import errno
-import os
 from io import BytesIO
-import tarfile
-from typing import BinaryIO, Optional
 
 from ...upstream_import import (
     add_implied_parents,
@@ -36,8 +32,6 @@
 from ...trace import warning
 from ...tree import Tree
 from ...transform import resolve_conflicts
-from ...transport import get_transport
-from ...workingtree import WorkingTree
 
 
 class UnknownType(BzrError):
@@ -80,7 +74,7 @@
 
 
 def _get_paths_to_process(
-        archive_file: str, prefix: Optional[str],
+        archive_file: str, prefix,
         implied_parents, exclude=None):
     to_process = set()
     for member in archive_file.getmembers():
@@ -106,7 +100,7 @@
 
 def _import_archive(
         tree: Tree, archive_file: str, file_ids_from,
-        target_tree: Optional[Tree] = None, exclude=None):
+        target_tree = None, exclude=None):
     prefix = common_directory(names_of_files(archive_file))
     try:
         transform = tree.transform

=== modified file 'cmds.py'
--- cmds.py	2020-11-21 03:31:58 +0000
+++ cmds.py	2020-11-28 13:33:24 +0000
@@ -26,7 +26,6 @@
 import os
 import shutil
 import tempfile
-from typing import Optional
 
 from ... import (
     urlutils,
@@ -760,15 +759,15 @@
                     'merge had completed failed. Add the new changelog '
                     'entry yourself, review the merge, and then commit.')
 
-    def run(self, location: Optional[str] = None,
-            upstream_branch: Optional[str] = None,
-            version: Optional[str] = None,
-            distribution: Optional[str] = None, package: Optional[str] = None,
-            directory: str = ".", revision=None, merge_type=None,
-            last_version: Optional[str] = None,
-            force: Optional[bool] = None, snapshot: bool = False,
-            launchpad: bool = False, force_pristine_tar: bool = False,
-            dist_command: Optional[str] = None):
+    def run(self, location=None,
+            upstream_branch=None,
+            version=None,
+            distribution=None, package=None,
+            directory=".", revision=None, merge_type=None,
+            last_version=None,
+            force=None, snapshot=False,
+            launchpad=False, force_pristine_tar=False,
+            dist_command=None):
         from debian.changelog import Version
 
         from .hooks import run_hook