Merge into trunk : drop-irc : Code : Breezy

Status:	Merged
Approved by:	Jelmer Vernooij on 2024-02-18
Approved revision:	7927
Merged at revision:	7928
Proposed branch:	lp://qastaging/~jelmer/brz/drop-irc
Merge into:	lp://qastaging/brz
Diff against target:	84 lines (+8/-9) 3 files modified README.rst (+1/-2) doc/developers/HACKING.txt (+1/-1) doc/developers/overview.txt (+6/-6)
To merge this branch:	bzr merge lp://qastaging/~jelmer/brz/drop-irc
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Jelmer Vernooij			Approve on 2024-02-17
Review via email: mp+460723@code.qastaging.launchpad.net

Commit message

Drop IRC as communication channel, just reference Matrix

Description of the change

Drop IRC as communication channel, just reference Matrix

Revision history for this message

Jelmer Vernooij (jelmer) on 2024-02-17:

#

review: Approve

Revision history for this message

The Breezy Bot (the-breezy-bot) wrote on 2024-02-17:

#

Download full text (13.3 KiB)

The attempt to merge lp:~jelmer/brz/drop-irc 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._swqoob1
  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 (21 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.8-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.2.1)
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)
     ━━━━━━...

The attempt to merge lp:~jelmer/brz/drop-irc 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._swqoob1
  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 (21 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.8-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.2.1)
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.1 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 (5.1 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 (93 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 93.0/93.0 kB 3.0 MB/s eta 0:00:00
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 (8.8 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-23.2-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)

... OUTPUT TRIMMED ...

[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._swqoob1/doc/developers'
/tmp/tarmac/branch._swqoob1/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._swqoob1'
ruff check .
warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `pyproject.toml`:
  - 'ignore' -> 'lint.ignore'
  - 'select' -> 'lint.select'
  - 'unfixable' -> 'lint.unfixable'
  - 'isort' -> 'lint.isort'
  - 'pydocstyle' -> 'lint.pydocstyle'
  - 'extend-per-file-ignores' -> 'lint.extend-per-file-ignores'
breezy/bzr/inventory.py:768:41: SIM910 [*] Use `info.get(b"parent_id_basename_to_file_id")` instead of `info.get(b"parent_id_basename_to_file_id", None)`
breezy/bzr/remote.py:2826:13: S202 Uses of `tarfile.extractall()`
breezy/bzr/tests/test_knit.py:295:13: SIM113 Use `enumerate()` for index variable `count` in `for` loop
breezy/bzr/tests/test_weave.py:667:13: SIM113 Use `enumerate()` for index variable `i` in `for` loop
breezy/bzr/vf_repository.py:468:41: SIM910 [*] Use `parent_entries.get(file_id)` instead of `parent_entries.get(file_id, None)`
breezy/bzr/vf_repository.py:1514:13: SIM113 Use `enumerate()` for index variable `count` in `for` loop
breezy/bzr/weave.py:671:13: SIM113 Use `enumerate()` for index variable `lineno` in `for` loop
breezy/bzr/weave.py:795:13: SIM113 Use `enumerate()` for index variable `lineno` in `for` loop
breezy/plugins/stats/cmds.py:297:17: SIM113 Use `enumerate()` for index variable `cur_parents` in `for` loop
breezy/plugins/stats/cmds.py:315:13: SIM113 Use `enumerate()` for index variable `i` in `for` loop
breezy/plugins/weave_fmt/bzrdir.py:364:17: SIM113 Use `enumerate()` for index variable `i` in `for` loop
breezy/tests/test_http.py:979:13: SIM113 Use `enumerate()` for index variable `cur` in `for` loop
breezy/tests/test_http.py:1054:13: SIM113 Use `enumerate()` for index variable `cur` in `for` loop
breezy/transport/__init__.py:562:13: SIM113 Use `enumerate()` for index variable `count` in `for` loop
breezy/ui/text.py:106:13: SIM113 Use `enumerate()` for index variable `index` in `for` loop
Found 15 errors.
[*] 2 fixable with the `--fix` option.
make[1]: *** [Makefile:333: ruff] Error 1
make[1]: Leaving directory '/tmp/tarmac/branch._swqoob1'
make: *** [Makefile:351: ruff-fmt-check] Error 2

Breezy

Merge lp://qastaging/~jelmer/brz/drop-irc into lp://qastaging/brz

Commit message

Description of the change

Preview Diff

Subscribers