Merge into trunk : config-race-trunk : Code : Breezy

Status:	Merged
Approved by:	Jelmer Vernooij on 2024-03-24
Approved revision:	7931
Merged at revision:	7931
Proposed branch:	lp:~jelmer/brz/config-race-trunk
Merge into:	lp:brz
Diff against target:	29 lines (+7/-3) 1 file modified breezy/config.py (+7/-3)
To merge this branch:	bzr merge lp:~jelmer/brz/config-race-trunk
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Jelmer Vernooij			Approve on 2024-03-10
Review via email: mp+462105@code.launchpad.net

Commit message

Ignore race conditions loading config

Description of the change

Ignore race conditions loading config

Revision history for this message

Jelmer Vernooij (jelmer) on 2024-03-10:

#

review: Approve

Revision history for this message

The Breezy Bot (the-breezy-bot) wrote on 2024-03-11:

#

Download full text (15.1 KiB)

The attempt to merge lp:~jelmer/brz/config-race-trunk into lp:brz failed. Command exited with 2.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Using cached setuptools_gettext-0.1.11-py3-none-any.whl.metadata (1.9 kB)
Requirement already satisfied: setuptools>=60.8 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Using cached setuptools_gettext-0.1.11-py3-none-any.whl (13 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.11
Obtaining file:///tmp/tarmac/branch.oulr26om
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Installing backend dependencies: started
  Installing backend dependencies: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (6.0.1)
Collecting testtools>=0.9.5 (from breezy==3.4.0.dev0)
  Using cached testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios (from breezy==3.4.0.dev0)
  Using cached testscenarios-0.5.0-py2.py3-none-any.whl.metadata (12 kB)
Collecting python-subunit (from breezy==3.4.0.dev0)
  Using cached python_subunit-1.4.4-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29 (from breezy==3.4.0.dev0)
  Using cached Cython-3.0.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (from breezy==3.4.0.dev0) (0.3.2)
Collecting docutils (from breezy==3.4.0.dev0)
  Using cached docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (from breezy==3.4.0.dev0) (68.1.2)
Collecting sphinx (from breezy==3.4.0.dev0)
  Using cached sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext (from breezy==3.4.0.dev0)
  Using cached sphinx_epytext-0.0.4-py3-none-any.whl
Collecting fastimport (from breezy==3.4.0.dev0)
  Using cached fastimport-0.9.14-py2.py3-none-any.whl
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-pac...

The attempt to merge lp:~jelmer/brz/config-race-trunk into lp:brz failed. Command exited with 2.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Using cached setuptools_gettext-0.1.11-py3-none-any.whl.metadata (1.9 kB)
Requirement already satisfied: setuptools>=60.8 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Using cached setuptools_gettext-0.1.11-py3-none-any.whl (13 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.11
Obtaining file:///tmp/tarmac/branch.oulr26om
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Installing backend dependencies: started
  Installing backend dependencies: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (6.0.1)
Collecting testtools>=0.9.5 (from breezy==3.4.0.dev0)
  Using cached testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios (from breezy==3.4.0.dev0)
  Using cached testscenarios-0.5.0-py2.py3-none-any.whl.metadata (12 kB)
Collecting python-subunit (from breezy==3.4.0.dev0)
  Using cached python_subunit-1.4.4-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29 (from breezy==3.4.0.dev0)
  Using cached Cython-3.0.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (from breezy==3.4.0.dev0) (0.3.2)
Collecting docutils (from breezy==3.4.0.dev0)
  Using cached docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (from breezy==3.4.0.dev0) (68.1.2)
Collecting sphinx (from breezy==3.4.0.dev0)
  Using cached sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext (from breezy==3.4.0.dev0)
  Using cached sphinx_epytext-0.0.4-py3-none-any.whl
Collecting fastimport (from breezy==3.4.0.dev0)
  Using cached fastimport-0.9.14-py2.py3-none-any.whl
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (1.11.0)
Requirement already satisfied: paramiko>=1.6.2 in /usr/local/lib/python3.11/dist-packages (from breezy==3.4.0.dev0) (3.3.1)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (1.18.0)
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.4.0.dev0) (0.20.4)
Requirement already satisfied: lazr.restfulclient>=0.14.2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.4.0.dev0) (0.14.5)
Requirement already satisfied: lazr.uri in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.4.0.dev0) (1.0.6)
Requirement already satisfied: six in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.4.0.dev0) (1.16.0)
Requirement already satisfied: bcrypt>=3.2 in /usr/local/lib/python3.11/dist-packages (from paramiko>=1.6.2->breezy==3.4.0.dev0) (4.0.1)
Requirement already satisfied: cryptography>=3.3 in /usr/lib/python3/dist-packages (from paramiko>=1.6.2->breezy==3.4.0.dev0) (38.0.4)
Requirement already satisfied: pynacl>=1.5 in /usr/local/lib/python3.11/dist-packages (from paramiko>=1.6.2->breezy==3.4.0.dev0) (1.5.0)
Collecting iso8601 (from python-subunit->breezy==3.4.0.dev0)
  Using cached iso8601-2.1.0-py3-none-any.whl.metadata (3.7 kB)
Collecting sphinxcontrib-applehelp (from sphinx->breezy==3.4.0.dev0)
  Using cached sphinxcontrib_applehelp-1.0.8-py3-none-any.whl.metadata (2.3 kB)
Collecting sphinxcontrib-devhelp (from sphinx->breezy==3.4.0.dev0)
  Using cached sphinxcontrib_devhelp-1.0.6-py3-none-any.whl.metadata (2.3 kB)
Collecting sphinxcontrib-jsmath (from sphinx->breezy==3.4.0.dev0)
  Using cached sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl.metadata (1.4 kB)
Collecting sphinxcontrib-htmlhelp>=2.0.0 (from sphinx->breezy==3.4.0.dev0)
  Using cached sphinxcontrib_htmlhelp-2.0.5-py3-none-any.whl.metadata (2.3 kB)
Collecting sphinxcontrib-serializinghtml>=1.1.9 (from sphinx->breezy==3.4.0.dev0)
  Using cached sphinxcontrib_serializinghtml-1.1.10-py3-none-any.whl.metadata (2.4 kB)
Collecting sphinxcontrib-qthelp (from sphinx->breezy==3.4.0.dev0)
  Using cached sphinxcontrib_qthelp-1.0.7-py3-none-any.whl.metadata (2.2 kB)
Collecting Jinja2>=3.0 (from sphinx->breezy==3.4.0.dev0)
  Using cached Jinja2-3.1.3-py3-none-any.whl.metadata (3.3 kB)
Requirement already satisfied: Pygments>=2.14 in /usr/lib/python3/dist-packages (from sphinx->breezy==3.4.0.dev0) (2.17.2)
Collecting snowballstemmer>=2.0 (from sphinx->breezy==3.4.0.dev0)
  Using cached snowballstemmer-2.2.0-py2.py3-none-any.whl.metadata (6.5 kB)
Collecting babel>=2.9 (from sphinx->breezy==3.4.0.dev0)
  Using cached Babel-2.14.0-py3-none-any.whl.metadata (1.6 kB)
Collecting alabaster<0.8,>=0.7 (from sphinx->breezy==3.4.0.dev0)
  Using cached alabaster-0.7.16-py3-none-any.whl.metadata (2.9 kB)
Collecting imagesize>=1.3 (from sphinx->breezy==3.4.0.dev0)
  Using cached imagesize-1.4.1-py2.py3-none-any.whl.metadata (1.5 kB)
Collecting requests>=2.25.0 (from sphinx->breezy==3.4.0.dev0)
  Using cached requests-2.31.0-py3-none-any.whl.metadata (4.6 kB)
Collecting packaging>=21.0 (from sphinx->breezy==3.4.0.dev0)
  Using cached packaging-24.0-py3-none-any.whl.metadata (3.2 kB)
Collecting pbr>=0.11 (from testscenarios->breezy==3.4.0.dev0)
  Using cached pbr-6.0.0-py2.py3-none-any.whl.metadata (1.3 kB)
Collecting MarkupSafe>=2.0 (from Jinja2>=3.0->sphinx->breezy==3.4.0.dev0)
  Using cached MarkupSafe-2.1.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.0 kB)
Requirement already satisfied: cffi>=1.4.1 in /usr/local/lib/python3.11/dist-packages (from pynacl>=1.5->paramiko>=1.6.2->breezy==3.4.0.dev0) (1.16.0)
Collecting charset-normalizer<4,>=2 (from requests>=2.25.0->sphinx->breezy==3.4.0.dev0)
  Using cached charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (33 kB)
Collecting idna<4,>=2.5 (from requests>=2.25.0->sphinx->breezy==3.4.0.dev0)
  Using cached idna-3.6-py3-none-any.whl.metadata (9.9 kB)
Collecting certifi>=2017.4.17 (from requests>=2.25.0->sphinx->breezy==3.4.0.dev0)
  Using cached certifi-2024.2.2-py3-none-any.whl.metadata (2.2 kB)
Requirement already satisfied: pyparsing!=3.0.0,!=3.0.1,!=3.0.2,!=3.0.3,<4,>=2.4.2 in /usr/lib/python3/dist-packages (from httplib2->launchpadlib>=1.6.3->breezy==3.4.0.dev0) (3.1.1)
Requirement already satisfied: pycparser in /usr/local/lib/python3.11/dist-packages (from cffi>=1.4.1->pynacl>=1.5->paramiko>=1.6.2->breezy==3.4.0.dev0) (2.21)
Using cached Cython-3.0.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (3.6 MB)
Using cached testtools-2.7.1-py3-none-any.whl (179 kB)
Using cached docutils-0.20.1-py3-none-any.whl (572 kB)
Using cached python_subunit-1.4.4-py3-none-any.whl (104 kB)
Using cached sphinx-7.2.6-py3-none-any.whl (3.2 MB)
Using cached testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)

... OUTPUT TRIMMED ...

[2Kwriting output... [ 99%] ui
[2Kwriting output... [100%] win32_build_setup
generating indices... done
writing additional pages... search done
dumping search index in English (code: en)... done
dumping object inventory... done
build succeeded, 22 warnings.

The HTML pages are in _build/html.

Build finished. The HTML pages are in _build/html.
make[1]: Leaving directory '/tmp/tarmac/branch.oulr26om/doc/developers'
/tmp/tarmac/branch.oulr26om/bin/python -m mypy breezy
breezy/plugins/fastimport/bzr_commit_handler.py:618: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs  [annotation-unchecked]
Success: no issues found in 978 source files
cargo fmt --all --check
make ruff --check
make[1]: Entering directory '/tmp/tarmac/branch.oulr26om'
ruff check .
breezy/_known_graph_py.py:37:16: UP032 [*] Use f-string instead of `format` call
breezy/branch.py:1836:16: UP032 [*] Use f-string instead of `format` call
breezy/branch.py:1918:16: UP032 [*] Use f-string instead of `format` call
breezy/bzr/_dirstate_helpers_py.py:63:13: UP032 [*] Use f-string instead of `format` call
breezy/bzr/branch.py:545:21: UP032 [*] Use f-string instead of `format` call
breezy/bzr/bzrdir.py:1539:21: UP032 [*] Use f-string instead of `format` call
breezy/bzr/chk_map.py:641:16: UP032 [*] Use f-string instead of `format` call
breezy/bzr/chk_map.py:698:16: UP032 [*] Use f-string instead of `format` call
breezy/bzr/dirstate.py:2232:29: UP032 [*] Use f-string instead of `format` call
breezy/bzr/dirstate.py:3348:33: UP032 [*] Use f-string instead of `format` call
breezy/bzr/dirstate.py:3683:25: UP032 [*] Use f-string instead of `format` call
breezy/bzr/dirstate.py:4350:21: UP032 [*] Use f-string instead of `format` call
breezy/bzr/groupcompress_repo.py:728:25: UP032 [*] Use f-string instead of `format` call
breezy/bzr/groupcompress_repo.py:741:25: UP032 [*] Use f-string instead of `format` call
breezy/bzr/inventory.py:1006:21: UP032 [*] Use f-string instead of `format` call
breezy/bzr/inventory.py:1132:29: UP032 [*] Use f-string instead of `format` call
breezy/bzr/pack_repo.py:346:16: UP032 [*] Use f-string instead of `format` call
breezy/bzr/pack_repo.py:842:17: UP032 [*] Use f-string instead of `format` call
breezy/bzr/remote.py:2231:17: UP032 [*] Use f-string instead of `format` call
breezy/bzr/remote.py:3321:17: UP032 [*] Use f-string instead of `format` call
breezy/bzr/remote.py:3405:17: UP032 [*] Use f-string instead of `format` call
breezy/bzr/remote.py:3985:21: UP032 [*] Use f-string instead of `format` call
breezy/bzr/smart/medium.py:390:16: UP032 [*] Use f-string instead of `format` call
breezy/bzr/smart/medium.py:1013:16: UP032 [*] Use f-string instead of `format` call
breezy/bzr/tests/per_repository_vf/test_check_reconcile.py:1041:21: UP032 [*] Use f-string instead of `format` call
breezy/bzr/tests/test__dirstate_helpers.py:105:13: UP032 [*] Use f-string instead of `format` call
breezy/bzr/tests/test__dirstate_helpers.py:386:21: UP032 [*] Use f-string instead of `format` call
breezy/bzr/tests/test_btree_index.py:1214:17: UP032 [*] Use f-string instead of `format` call
breezy/bzr/tests/test_dirstate.py:3396:13: UP032 [*] Use f-string instead of `format` call
breezy/bzr/vf_search.py:329:16: UP032 [*] Use f-string instead of `format` call
breezy/bzr/weave.py:818:17: UP032 [*] Use f-string instead of `format` call
breezy/bzr/workingtree_4.py:1947:17: UP032 [*] Use f-string instead of `format` call
breezy/bzr/workingtree_4.py:2401:21: UP032 [*] Use f-string instead of `format` call
breezy/crash.py:86:9: UP032 [*] Use f-string instead of `format` call
breezy/delta.py:82:13: UP032 [*] Use f-string instead of `format` call
breezy/diff.py:839:21: UP032 [*] Use f-string instead of `format` call
breezy/git/object_store.py:93:25: UP032 [*] Use f-string instead of `format` call
breezy/git/repository.py:61:13: UP032 [*] Use f-string instead of `format` call
breezy/git/tree.py:83:16: UP032 [*] Use f-string instead of `format` call
breezy/git/tree.py:125:16: UP032 [*] Use f-string instead of `format` call
breezy/git/tree.py:170:13: UP032 [*] Use f-string instead of `format` call
breezy/git/tree.py:215:16: UP032 [*] Use f-string instead of `format` call
breezy/lru_cache.py:37:16: UP032 [*] Use f-string instead of `format` call
breezy/plugin.py:147:16: UP032 [*] Use f-string instead of `format` call
breezy/plugin.py:570:16: UP032 [*] Use f-string instead of `format` call
breezy/plugins/fastimport/tests/test_generic_processor.py:204:21: UP032 [*] Use f-string instead of `format` call
breezy/plugins/github/forge.py:906:13: UP032 [*] Use f-string instead of `format` call
breezy/plugins/propose/cmds.py:348:33: UP032 [*] Use f-string instead of `format` call
breezy/progress.py:105:16: UP032 [*] Use f-string instead of `format` call
breezy/registry.py:95:13: UP032 [*] Use f-string instead of `format` call
breezy/repository.py:424:20: UP032 [*] Use f-string instead of `format` call
breezy/revisionspec.py:108:16: UP032 [*] Use f-string instead of `format` call
breezy/revisiontree.py:75:16: UP032 [*] Use f-string instead of `format` call
breezy/status.py:480:16: UP032 [*] Use f-string instead of `format` call
breezy/symbol_versioning.py:80:18: UP032 [*] Use f-string instead of `format` call
breezy/symbol_versioning.py:143:26: UP032 [*] Use f-string instead of `format` call
breezy/tests/TestUtil.py:67:21: UP032 [*] Use f-string instead of `format` call
breezy/tests/__init__.py:560:13: UP032 [*] Use f-string instead of `format` call
breezy/tests/blackbox/test_info.py:585:13: UP032 [*] Use f-string instead of `format` call
breezy/tests/blackbox/test_info.py:1358:26: UP032 [*] Use f-string instead of `format` call
breezy/tests/blackbox/test_info.py:1368:27: UP032 [*] Use f-string instead of `format` call
breezy/tests/features.py:145:23: UP032 [*] Use f-string instead of `format` call
breezy/tests/matchers.py:88:16: UP032 [*] Use f-string instead of `format` call
breezy/tests/matchers.py:106:16: UP032 [*] Use f-string instead of `format` call
breezy/tests/per_interbranch/__init__.py:42:14: UP032 [*] Use f-string instead of `format` call
breezy/tests/per_interrepository/__init__.py:49:14: UP032 [*] Use f-string instead of `format` call
breezy/tests/per_tree/test_test_trees.py:487:13: UP032 [*] Use f-string instead of `format` call
breezy/tests/stub_sftp.py:503:17: UP032 [*] Use f-string instead of `format` call
breezy/transport/__init__.py:208:16: UP032 [*] Use f-string instead of `format` call
breezy/transport/__init__.py:1578:34: UP032 [*] Use f-string instead of `format` call
breezy/transport/http/urllib.py:160:21: UP032 [*] Use f-string instead of `format` call
breezy/transport/http/urllib.py:1863:17: UP032 [*] Use f-string instead of `format` call
breezy/transport/log.py:89:13: UP032 [*] Use f-string instead of `format` call
breezy/transport/remote.py:111:17: UP032 [*] Use f-string instead of `format` call
breezy/ui/__init__.py:121:16: UP032 [*] Use f-string instead of `format` call
breezy/urlutils.py:293:16: UP032 [*] Use f-string instead of `format` call
Found 76 errors.
[*] 76 fixable with the `--fix` option.
make[1]: *** [Makefile:335: ruff] Error 1
make[1]: Leaving directory '/tmp/tarmac/branch.oulr26om'
make: *** [Makefile:353: ruff-fmt-check] Error 2

Revision history for this message

The Breezy Bot (the-breezy-bot) wrote on 2024-03-16:

#

Download full text (13.4 KiB)

The attempt to merge lp:~jelmer/brz/config-race-trunk into lp:brz failed. Command exited with 2.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.11-py3-none-any.whl.metadata (1.9 kB)
Requirement already satisfied: setuptools>=60.8 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.11-py3-none-any.whl (13 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.11
Obtaining file:///tmp/tarmac/branch.svcsxw51
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Installing backend dependencies: started
  Installing backend dependencies: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (6.0.1)
Collecting testtools>=0.9.5 (from breezy==3.4.0.dev0)
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios (from breezy==3.4.0.dev0)
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl.metadata (12 kB)
Collecting python-subunit (from breezy==3.4.0.dev0)
  Downloading python_subunit-1.4.4-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29 (from breezy==3.4.0.dev0)
  Using cached Cython-3.0.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (from breezy==3.4.0.dev0) (0.3.3)
Collecting docutils (from breezy==3.4.0.dev0)
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (from breezy==3.4.0.dev0) (68.1.2)
Collecting sphinx (from breezy==3.4.0.dev0)
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext (from breezy==3.4.0.dev0)
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport (from breezy==3.4.0.dev0)
  Downloading fastimport-0.9.14.tar.gz (...

The attempt to merge lp:~jelmer/brz/config-race-trunk into lp:brz failed. Command exited with 2.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.11-py3-none-any.whl.metadata (1.9 kB)
Requirement already satisfied: setuptools>=60.8 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.11-py3-none-any.whl (13 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.11
Obtaining file:///tmp/tarmac/branch.svcsxw51
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Installing backend dependencies: started
  Installing backend dependencies: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (6.0.1)
Collecting testtools>=0.9.5 (from breezy==3.4.0.dev0)
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios (from breezy==3.4.0.dev0)
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl.metadata (12 kB)
Collecting python-subunit (from breezy==3.4.0.dev0)
  Downloading python_subunit-1.4.4-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29 (from breezy==3.4.0.dev0)
  Using cached Cython-3.0.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (from breezy==3.4.0.dev0) (0.3.3)
Collecting docutils (from breezy==3.4.0.dev0)
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (from breezy==3.4.0.dev0) (68.1.2)
Collecting sphinx (from breezy==3.4.0.dev0)
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext (from breezy==3.4.0.dev0)
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting fastimport (from breezy==3.4.0.dev0)
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 2.2 MB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (1.11.0)
Requirement already satisfied: paramiko>=1.6.2 in /usr/local/lib/python3.11/dist-packages (from breezy==3.4.0.dev0) (3.3.1)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (1.18.0)
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.4.0.dev0) (0.20.4)
Requirement already satisfied: lazr.restfulclient>=0.14.2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.4.0.dev0) (0.14.5)
Requirement already satisfied: lazr.uri in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.4.0.dev0) (1.0.6)
Requirement already satisfied: six in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.4.0.dev0) (1.16.0)
Requirement already satisfied: bcrypt>=3.2 in /usr/local/lib/python3.11/dist-packages (from paramiko>=1.6.2->breezy==3.4.0.dev0) (4.0.1)
Requirement already satisfied: cryptography>=3.3 in /usr/lib/python3/dist-packages (from paramiko>=1.6.2->breezy==3.4.0.dev0) (38.0.4)
Requirement already satisfied: pynacl>=1.5 in /usr/local/lib/python3.11/dist-packages (from paramiko>=1.6.2->breezy==3.4.0.dev0) (1.5.0)
Collecting iso8601 (from python-subunit->breezy==3.4.0.dev0)
  Downloading iso8601-2.1.0-py3-none-any.whl.metadata (3.7 kB)
Collecting sphinxcontrib-applehelp (from sphinx->breezy==3.4.0.dev0)
  Downloading sphinxcontrib_applehelp-1.0.8-py3-none-any.whl.metadata (2.3 kB)
Collecting sphinxcontrib-devhelp (from sphinx->breezy==3.4.0.dev0)
  Downloading sphinxcontrib_devhelp-1.0.6-py3-none-any.whl.metadata (2.3 kB)
Collecting sphinxcontrib-jsmath (from sphinx->breezy==3.4.0.dev0)
  Downloading sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl.metadata (1.4 kB)
Collecting sphinxcontrib-htmlhelp>=2.0.0 (from sphinx->breezy==3.4.0.dev0)
  Downloading sphinxcontrib_htmlhelp-2.0.5-py3-none-any.whl.metadata (2.3 kB)
Collecting sphinxcontrib-serializinghtml>=1.1.9 (from sphinx->breezy==3.4.0.dev0)
  Downloading sphinxcontrib_serializinghtml-1.1.10-py3-none-any.whl.metadata (2.4 kB)
Collecting sphinxcontrib-qthelp (from sphinx->breezy==3.4.0.dev0)
  Downloading sphinxcontrib_qthelp-1.0.7-py3-none-any.whl.metadata (2.2 kB)
Collecting Jinja2>=3.0 (from sphinx->breezy==3.4.0.dev0)
  Downloading Jinja2-3.1.3-py3-none-any.whl.metadata (3.3 kB)
Requirement already satisfied: Pygments>=2.14 in /usr/lib/python3/dist-packages (from sphinx->breezy==3.4.0.dev0) (2.17.2)
Collecting snowballstemmer>=2.0 (from sphinx->breezy==3.4.0.dev0)
  Downloading snowballstemmer-2.2.0-py2.py3-none-any.whl.metadata (6.5 kB)
Collecting babel>=2.9 (from sphinx->breezy==3.4.0.dev0)
  Downloading Babel-2.14.0-py3-none-any.whl.metadata (1.6 kB)
Collecting alabaster<0.8,>=0.7 (from sphinx->breezy==3.4.0.dev0)
  Downloading alabaster-0.7.16-py3-none-any.whl.metadata (2.9 kB)
Collecting imagesize>=1.3 (from sphinx->breezy==3.4.0.dev0)
  Downloading imagesize-1.4.1-py2.py3-none-any.whl.metadata (1.5 kB)
Collecting requests>=2.25.0 (from sphinx->breezy==3.4.0.dev0)
  Downloading requests-2.31.0-py3-none-any.whl.metadata (4.6 kB)
Collecting packaging>=21.0 (from sphinx->breezy==3.4.0.dev0)
  Downloading packaging-24.0-py3-none-any.whl.metadata (3.2 kB)
Collecting pbr>=0.11 (from testscenarios->breezy==3.4.0.dev0)
  Downloading pbr-6.0.0-py2.py3-none-any.whl.metadata (1.3 kB)
Collecting MarkupSafe>=2.0 (from Jinja2>=3.0->sphinx->breezy==3.4.0.dev0)
  Downloading MarkupSafe-2.1.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.0 kB)
Requirement already satisfied: cffi>=1.4.1 in /usr/local/lib/python3.11/dist-packages (from pynacl>=1.5->paramiko>=1.6.2->breezy==3.4.0.dev0) (1.16.0)
Collecting charset-normalizer<4,>=2 (from requests>=2.25.0->sphinx->breezy==3.4.0.dev0)
  Downloading charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (33 kB)
Collecting idna<4,>=2.5 (from requests>=2.25.0->sphinx->breezy==3.4.0.dev0)
  Downloading idna-3.6-py3-none-any.whl.metadata (9.9 kB)
Collecting certifi>=2017.4.17 (from requests>=2.25.0->sphinx->breezy==3.4.0.dev0)
  Downloading certifi-2024.2.2-py3-none-any.whl.metadata (2.2 kB)
Requirement already satisfied: pyparsing!=3.0.0,!=3.0.1,!=3.0.2,!=3.0.3,<4,>=2.4.2 in /usr/lib/python3/dist-packages (from httplib2->launchpadlib>=1.6.3->breezy==3.4.0.dev0) (3.1.1)
Requirement already satisfied: pycparser in /usr/local/lib/python3.11/dist-packages (from cffi>=1.4.1->pynacl>=1.5->paramiko>=1.6.2->breezy==3.4.0.dev0) (2.21)
Using cached Cython-3.0.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (3.6 MB)

... OUTPUT TRIMMED ...

[2Kwriting output... [  3%] api/index
[2Kwriting output... [  4%] apport
[2Kwriting output... [  5%] authentication-ring
[2Kwriting output... [  6%] branding
[2Kwriting output... [  8%] btree_index_prefetch
[2Kwriting output... [  9%] bug-handling
[2Kwriting output... [ 10%] bundle-format4
[2Kwriting output... [ 12%] bundles
[2Kwriting output... [ 13%] case-insensitive-file-systems
[2Kwriting output... [ 14%] check
[2Kwriting output... [ 15%] code-review
[2Kwriting output... [ 17%] code-style
[2Kwriting output... [ 18%] colocated-branches
[2Kwriting output... [ 19%] config-rationale
[2Kwriting output... [ 21%] configuration
[2Kwriting output... [ 22%] container-format
[2Kwriting output... [ 23%] content-filtering
[2Kwriting output... [ 24%] contribution-quickstart
[2Kwriting output... [ 26%] cycle
[2Kwriting output... [ 27%] development-repo
[2Kwriting output... [ 28%] dirstate
[2Kwriting output... [ 29%] documenting-changes
[2Kwriting output... [ 31%] ec2
[2Kwriting output... [ 32%] feature-flags
[2Kwriting output... [ 33%] fetch
[2Kwriting output... [ 35%] groupcompress-design
[2Kwriting output... [ 36%] implementation-notes
[2Kwriting output... [ 37%] improved_chk_index
[2Kwriting output... [ 38%] index
[2Kwriting output... [ 40%] index-plain
[2Kwriting output... [ 41%] indices
[2Kwriting output... [ 42%] integration
[2Kwriting output... [ 44%] inventory
[2Kwriting output... [ 45%] last-modified
[2Kwriting output... [ 46%] lca-merge
[2Kwriting output... [ 47%] lca_tree_merging
[2Kwriting output... [ 49%] miscellaneous-notes
[2Kwriting output... [ 50%] network-protocol
[2Kwriting output... [ 51%] overview
[2Kwriting output... [ 53%] packrepo
[2Kwriting output... [ 54%] performance-roadmap-rationale
[2Kwriting output... [ 55%] plans/index
[2Kwriting output... [ 56%] plans/nested-trees
[2Kwriting output... [ 58%] plans/performance/add
[2Kwriting output... [ 59%] plans/performance/annotate
[2Kwriting output... [ 60%] plans/performance/bundle-creation
[2Kwriting output... [ 62%] plans/performance/commit
[2Kwriting output... [ 63%] plans/performance/diff
[2Kwriting output... [ 64%] plans/performance/directory-fingerprints
[2Kwriting output... [ 65%] plans/performance/gc
[2Kwriting output... [ 67%] plans/performance/incremental-push-pull
[2Kwriting output... [ 68%] plans/performance/initial-push-pull
[2Kwriting output... [ 69%] plans/performance/merge-scaling
[2Kwriting output... [ 71%] plans/performance/missing
[2Kwriting output... [ 72%] plans/performance/performance-use-case-analysis
[2Kwriting output... [ 73%] plans/performance/planned-change-integration
[2Kwriting output... [ 74%] plans/performance/planned-performance-changes
[2Kwriting output... [ 76%] plans/performance/revert
[2Kwriting output... [ 77%] plans/performance/roadmap
[2Kwriting output... [ 78%] plans/performance/status
[2Kwriting output... [ 79%] plans/performance/uncommit
[2Kwriting output... [ 81%] plans/performance/update
[2Kwriting output... [ 82%] plans/tortoise-strategy
[2Kwriting output... [ 83%] plugin-api
[2Kwriting output... [ 85%] plugin-development
[2Kwriting output... [ 86%] ppa
[2Kwriting output... [ 87%] principles
[2Kwriting output... [ 88%] profiling
[2Kwriting output... [ 90%] releasing
[2Kwriting output... [ 91%] repository
[2Kwriting output... [ 92%] repository-stream
[2Kwriting output... [ 94%] revision-properties
[2Kwriting output... [ 95%] specifications
[2Kwriting output... [ 96%] testing
[2Kwriting output... [ 97%] transports
[2Kwriting output... [ 99%] ui
[2Kwriting output... [100%] win32_build_setup
generating indices... done
writing additional pages... search done
dumping search index in English (code: en)... done
dumping object inventory... done
build succeeded, 22 warnings.

The HTML pages are in _build/html.

Build finished. The HTML pages are in _build/html.
make[1]: Leaving directory '/tmp/tarmac/branch.svcsxw51/doc/developers'
/tmp/tarmac/branch.svcsxw51/bin/python -m mypy breezy
breezy/transport/ssh/__init__.py:33: error: Library stubs not installed for "paramiko"  [import-untyped]
breezy/transport/ssh/paramiko.py:24: error: Library stubs not installed for "paramiko"  [import-untyped]
breezy/tests/stub_sftp.py:27: error: Library stubs not installed for "paramiko"  [import-untyped]
breezy/tests/stub_sftp.py:27: note: Hint: On Debian systems, you can install the python3-typeshed package to provide mypy with stubs for many popular libraries. In virtual Python environments, you can instead run "python3 -m pip install types-paramiko".
breezy/tests/stub_sftp.py:27: note: (or run "mypy --install-types" to install all missing stub packages)
breezy/tests/stub_sftp.py:27: note: See https://mypy.readthedocs.io/en/stable/running_mypy.html#missing-imports
breezy/version_info_formats/format_yaml.py:19: error: Library stubs not installed for "yaml"  [import-untyped]
breezy/plugins/fastimport/bzr_commit_handler.py:618: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs  [annotation-unchecked]
breezy/tests/test_version_info.py:23: error: Library stubs not installed for "yaml"  [import-untyped]
breezy/tests/test_version_info.py:23: note: Hint: On Debian systems, you can install the python3-typeshed package to provide mypy with stubs for many popular libraries. In virtual Python environments, you can instead run "python3 -m pip install types-PyYAML".
Found 5 errors in 5 files (checked 978 source files)
make: *** [Makefile:74: mypy] Error 1

1	=== modified file 'breezy/config.py'
2	--- breezy/config.py 2023-11-16 15:15:02 +0000
3	+++ breezy/config.py 2024-03-16 16:21:54 +0000
4	@@ -3169,18 +3169,22 @@
5	Args:
6	bytes: A string representing the file content.
7	"""
8	- if self.is_loaded():
9	- raise AssertionError(f"Already loaded: {self._config_obj!r}")
10	co_input = BytesIO(bytes)
11	try:
12	# The config files are always stored utf8-encoded
13	- self._config_obj = ConfigObj(co_input, encoding="utf-8", list_values=False)
14	+ new_config_obj = ConfigObj(co_input, encoding="utf-8", list_values=False)
15	except configobj.ConfigObjError as e:
16	self._config_obj = None
17	raise ParseConfigError(e.errors, self.external_url()) from e
18	except UnicodeDecodeError as e:
19	raise ConfigContentError(self.external_url()) from e
20
21	+ if self._config_obj is not None:
22	+ if new_config_obj != self._config_obj:
23	+ raise AssertionError("ConfigObj instances are not equal")
24	+
25	+ self._config_obj = new_config_obj
26	+
27	def save_changes(self):
28	if not self.is_loaded():
29	# Nothing to save

Breezy

Merge lp:~jelmer/brz/config-race-trunk into lp:brz

Commit message

Description of the change

Preview Diff

Subscribers