Merge lp:~jelmer/brz/fix-flake8 into lp:brz

[Jelmer Vernooij]

Fix flake8 with newer versions of flake8.

Fix flake8 with newer versions of flake8.

[Jelmer Vernooij (jelmer)]

review: Approve

[Jelmer Vernooij (jelmer)]

The attempt to merge lp:~jelmer/brz/fix-flake8 into lp:brz failed. Below is the output from the failed tests.

python-junitxml (https://launchpad.net/pyjunitxml or http://pypi.python.org/pypi/junitxml) is required for this filter.Traceback (most recent call last):
  File "/usr/bin/subunit2junitxml", line 27, in <module>
    from junitxml import JUnitXmlResult
ModuleNotFoundError: No module named 'junitxml'

----------------------------------------------------------------------
Ran 0 tests in 0.026s

OK
brz: warning: some compiled extensions could not be loaded; see ``brz help missing-extensions``
make: Circular doc/en/Makefile <- doc/en/Makefile dependency dropped.

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

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

[Jelmer Vernooij (jelmer)]

No approved revision specified.

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

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

[Jelmer Vernooij (jelmer)]

No approved revision specified.

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

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

[Jelmer Vernooij (jelmer)]

No approved revision specified.

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

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

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

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

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

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

=== modified file 'breezy/bzr/reconcile.py'
--- breezy/bzr/reconcile.py	2020-02-18 01:57:45 +0000
+++ breezy/bzr/reconcile.py	2022-09-08 17:24:55 +0000
@@ -261,7 +261,7 @@
         new_inventories.insert_record_stream(stream)
         # if this worked, the set of new_inventory_vf.names should equal
         # the revisionds list
-        if not(set(new_inventories.keys()) == set(revision_keys)):
+        if set(new_inventories.keys()) != set(revision_keys):
             raise AssertionError()
         self.pb.update(gettext('Writing weave'))
         self.repo._activate_new_inventory()

=== modified file 'breezy/bzr/versionedfile.py'
--- breezy/bzr/versionedfile.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/versionedfile.py	2022-09-08 17:24:55 +0000
@@ -1702,11 +1702,11 @@
                 return
             elif ch_a and not ch_b:
                 # one-sided change:
-                yield(lines_a,)
+                yield (lines_a,)
             elif ch_b and not ch_a:
                 yield (lines_b,)
             elif lines_a == lines_b:
-                yield(lines_a,)
+                yield (lines_a,)
             else:
                 yield (lines_a, lines_b)
 

=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2022-08-22 18:19:46 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2022-09-08 17:24:55 +0000
@@ -33,7 +33,7 @@
     transport as _mod_transport,
     urlutils,
     )
-from...bzr import (
+from ...bzr import (
     bzrdir,
     )
 from ...errors import (

=== modified file 'breezy/textmerge.py'
--- breezy/textmerge.py	2022-07-02 13:44:01 +0000
+++ breezy/textmerge.py	2022-09-08 17:24:55 +0000
@@ -136,10 +136,10 @@
         pos_b = 0
         for ai, bi, l in sm.get_matching_blocks():
             # non-matching lines
-            yield(self.lines_a[pos_a:ai], self.lines_b[pos_b:bi])
+            yield (self.lines_a[pos_a:ai], self.lines_b[pos_b:bi])
             # matching lines
-            yield(self.lines_a[ai:ai + l],)
+            yield (self.lines_a[ai:ai + l],)
             pos_a = ai + l
             pos_b = bi + l
         # final non-matching lines
-        yield(self.lines_a[pos_a:-1], self.lines_b[pos_b:-1])
+        yield (self.lines_a[pos_a:-1], self.lines_b[pos_b:-1])

=== modified file 'byov.conf'
--- byov.conf	2022-07-09 14:29:29 +0000
+++ byov.conf	2022-09-08 17:24:55 +0000
@@ -22,7 +22,7 @@
 vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml
 [brz-xenial]
 vm.release = bionic
-byoci.setup.command = (pip3 install --upgrade pip && pip3 install --upgrade cython setuptools-rust sphinx paramiko merge3 && {subunit.clone} && {flake8.install3} && PATH="$HOME/.local/bin:$PATH" python3 setup.py develop --user && pip3 install -e '.[{brz.extras}]')
+byoci.setup.command = (pip3 install --upgrade pip && pip3 install --upgrade "pyopenssl>=0.22" cython setuptools-rust sphinx paramiko merge3 && {subunit.clone} && {flake8.install3} && PATH="$HOME/.local/bin:$PATH" 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=tools:$PYTHONPATH python3 -m flake8 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit"
 [brz-cosmic]