Merge lp:~jelmer/brz/flakes-fix into lp:brz/3.0

[Jelmer Vernooij]

Fix compatibility with newer versions of flake8.

Fix compatibility with newer versions of flake8.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

=== modified file 'breezy/git/object_store.py'
--- breezy/git/object_store.py	2019-04-14 03:19:31 +0000
+++ breezy/git/object_store.py	2020-05-30 01:13:39 +0000
@@ -791,13 +791,15 @@
             self.generate_pack_contents(have, want, progress, get_tagged,
                                         lossy=True))
 
-    def generate_pack_contents(self, have, want, progress=None,
+    def generate_pack_contents(self, have, want, shallow=None, progress=None,
                                ofs_delta=False, get_tagged=None, lossy=False):
         """Iterate over the contents of a pack file.
 
         :param have: List of SHA1s of objects that should not be sent
         :param want: List of SHA1s of objects that should be sent
         """
+        if shallow is not None:
+            raise NotImplementedError('shallow is currently not supported')
         processed = set()
         ret = self.lookup_git_shas(have + want)
         for commit_sha in have:

=== modified file 'breezy/git/server.py'
--- breezy/git/server.py	2018-11-11 14:23:06 +0000
+++ breezy/git/server.py	2020-05-30 01:13:39 +0000
@@ -92,12 +92,23 @@
             have = self.object_store.find_common_revisions(graph_walker)
             if wants is None:
                 return
+            shallows = getattr(graph_walker, 'shallow', frozenset())
             if isinstance(self.object_store, BazaarObjectStore):
-                return self.object_store.generate_pack_contents(
-                    have, wants, progress, get_tagged=get_tagged, lossy=True)
+                if shallows:
+                    return self.object_store.generate_pack_contents(
+                        have, wants, shallow=shallows,
+                        progress=progress, get_tagged=get_tagged, lossy=True)
+                else:
+                    return self.object_store.generate_pack_contents(
+                        have, wants, progress=progress,
+                        get_tagged=get_tagged, lossy=True)
             else:
-                return self.object_store.generate_pack_contents(
-                    have, wants, progress)
+                if shallows:
+                    return self.object_store.generate_pack_contents(
+                        have, wants, shallow=shallows, progress=progress)
+                else:
+                    return self.object_store.generate_pack_contents(
+                        have, wants, progress=progress)
 
 
 class BzrTCPGitServer(TCPGitServer):

=== modified file 'breezy/plugins/bash_completion/tests/test_bashcomp.py'
--- breezy/plugins/bash_completion/tests/test_bashcomp.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/bash_completion/tests/test_bashcomp.py	2020-05-30 01:13:39 +0000
@@ -85,7 +85,7 @@
         surplus = set(words) & self.completion_result
         if surplus:
             raise AssertionError('Completion should omit %r but it has %r'
-                                 % (surplus, res, self.completion_result))
+                                 % (surplus, self.completion_result))
 
     def get_script(self):
         commands.install_bzr_command_hooks()

=== modified file 'breezy/tests/blackbox/test_remember_option.py'
--- breezy/tests/blackbox/test_remember_option.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_remember_option.py	2020-05-30 01:13:39 +0000
@@ -195,8 +195,7 @@
             $ echo new parent > file
             $ brz commit -m 'new parent'
             $ cd ..
-            ''' % {'working_dir': self.working_dir},
-            null_output_matches_anything=True)
+            ''', null_output_matches_anything=True)
 
     def assertLocations(self, expected_locations):
         br, _ = branch.Branch.open_containing(self.working_dir)

=== modified file 'breezy/tests/test_source.py'
--- breezy/tests/test_source.py	2019-05-28 21:46:53 +0000
+++ breezy/tests/test_source.py	2020-05-30 01:13:39 +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-06-21 15:14:28 +0000
+++ byov.conf	2020-05-30 01:13:39 +0000
@@ -2,14 +2,15 @@
 # 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)
+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)
 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.install = (pip install  "setuptools<45" sphinx==1.8.5 sphinx_epytext)
 sphinx_epytext.install3 = (pip3 install sphinx_epytext)
 flake8.install = (pip install flake8)
 flake8.install3 = (pip3 install flake8)
@@ -32,7 +33,7 @@
 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} && {sphinx_epytext.install} && {sphinx_epytext.install3} && {cython.install} && {cython.install3})
+byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {dulwich.clone3} && {dulwich.install3} && {fastimport.clone} && {fastimport.install} && {fastimport.install3} && {subunit.clone} && {flake8.install} && {flake8.install3} && {sphinx_epytext.install} && {sphinx_epytext.install3} && {cython.install} && {cython.install3})
 # 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]