Merge lp://staging/~jelmer/brz/drop-dupes into lp://staging/brz
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | 7822 |
Merged at revision: | 7821 |
Proposed branch: | lp://staging/~jelmer/brz/drop-dupes |
Merge into: | lp://staging/brz |
Diff against target: |
674 lines (+79/-96) 20 files modified
breezy/bzr/branch.py (+1/-1) breezy/bzr/smart/client.py (+2/-2) breezy/bzr/smart/medium.py (+6/-6) breezy/bzr/smart/message.py (+1/-1) breezy/bzr/smart/protocol.py (+2/-2) breezy/bzr/tests/test_smart_transport.py (+20/-21) breezy/errors.py (+4/-17) breezy/git/remote.py (+6/-7) breezy/git/tests/test_remote.py (+9/-10) breezy/mergeable.py (+1/-1) breezy/osutils.py (+2/-2) breezy/tests/blackbox/test_serve.py (+2/-2) breezy/tests/per_interrepository/test_fetch.py (+1/-1) breezy/tests/per_transport.py (+1/-1) breezy/tests/test_http.py (+5/-5) breezy/tests/test_mergeable.py (+1/-1) breezy/tests/test_osutils.py (+2/-2) breezy/tests/test_sftp_transport.py (+2/-2) breezy/transport/http/urllib.py (+6/-7) breezy/transport/ssh/paramiko.py (+5/-5) |
To merge this branch: | bzr merge lp://staging/~jelmer/brz/drop-dupes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | Approve | ||
Review via email: mp+443305@code.staging.launchpad.net |
Commit message
Drop custom exceptions now present in python itself
Description of the change
Drop custom exceptions now present in python itself
To post a comment you must log in.
The attempt to merge lp:~jelmer/brz/drop-dupes into lp:brz failed. Command exited with 2.
Below is the output from the failed tests.
Collecting setuptools-gettext gettext- 0.1.3-py3- none-any. whl (10 kB) 11/site- packages (from setuptools-gettext) (66.1.1) gettext- 0.1.3 /tmp/tarmac/ branch. b5jpjtwm python3/ dist-packages (from breezy==3.3.3.dev0) (5.0.8) python3/ dist-packages (from breezy==3.3.3.dev0) (0.2) python3/ dist-packages (from breezy==3.3.3.dev0) (0.2.13) python3/ dist-packages (from breezy==3.3.3.dev0) (0.0.8) 0.21.5- cp311-cp311- manylinux_ 2_17_x86_ 64.manylinux201 4_x86_64. whl (511 kB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━ 511.8/511.8 kB 7.3 MB/s eta 0:00:00 python3/ dist-packages (from breezy==3.3.3.dev0) (1.26.12) python3/ dist-packages (from breezy==3.3.3.dev0) (6.0) 2.6.0-py3- none-any. whl (182 kB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━ 182.2/182.2 kB 7.1 MB/s eta 0:00:00 0.5.0-py2. py3-none- any.whl (21 kB) subunit- 1.4.2-py3- none-any. whl (106 kB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━ 106.8/106.8 kB 6.0 MB/s eta 0:00:00 python3/ dist-packages (from breezy==3.3.3.dev0) (5.0.4) 0.29.34- cp311-cp311- manylinux_ 2_17_x86_ 64.manylinux201 4_x86_64. manylinux_ 2_24_x86_ 64.whl (1.9 MB) 0.20.1- py3-none- any.whl (572 kB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━ 572.7/572.7 kB 9.3 MB/s eta 0:00:00 11/site- packages (from breezy==3.3.3.dev0) (66.1.1) 7.0.1-py3- none-any. whl (3.0 MB) ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━━━━━ ━━━ 3.0/3.0 MB 10.9 MB/s eta 0:00:00 epytext- 0.0.4.tar. gz (3.6 kB)
Downloading setuptools_
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.
Installing collected packages: setuptools-gettext
Successfully installed setuptools-
Obtaining file://
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/
Requirement already satisfied: fastbencode in /usr/lib/
Requirement already satisfied: patiencediff in /usr/lib/
Requirement already satisfied: merge3 in /usr/lib/
Collecting dulwich>=0.21.3
Downloading dulwich-
━━
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Collecting testtools
Downloading testtools-
━━
Collecting testscenarios
Downloading testscenarios-
Collecting python-subunit
Downloading python_
━━
Requirement already satisfied: flake8 in /usr/lib/
Collecting cython>=0.29
Using cached Cython-
Collecting docutils
Downloading docutils-
━━
Requirement already satisfied: setuptools in ./lib/python3.
Collecting sphinx
Downloading sphinx-
━━
Collecting sphinx-epytext
Downloading sphinx-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with ...