Merge lp://qastaging/~jelmer/brz/python-compat into lp://qastaging/brz/3.3
- python-compat
- Merge into 3.3
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~jelmer/brz/python-compat |
Merge into: | lp://qastaging/brz/3.3 |
Diff against target: |
147 lines (+16/-63) 3 files modified
breezy/bzr/_static_tuple_c.c (+14/-13) breezy/bzr/_str_helpers.pxd (+2/-2) breezy/python-compat.h (+0/-48) |
To merge this branch: | bzr merge lp://qastaging/~jelmer/brz/python-compat |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | Approve | ||
Review via email: mp+431801@code.qastaging.launchpad.net |
Commit message
Drop python 2 compat code.
Description of the change
Drop python 2 compat code.
The Breezy Bot (the-breezy-bot) wrote : | # |
The Breezy Bot (the-breezy-bot) wrote : | # |
The attempt to merge lp:~jelmer/brz/python-compat into lp:brz/3.3 failed. Below is the output from the failed tests.
Collecting setuptools-gettext
Using cached 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'
Preparing editable metadata (pyproject.toml): started
Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: merge3 in /usr/lib/
Requirement already satisfied: dulwich>=0.20.23 in /usr/lib/
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: configobj in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Requirement already satisfied: fastbencode in /usr/lib/
Requirement already satisfied: patiencediff in /usr/lib/
Collecting fastimport
Using cached fastimport-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/
Collecting python-subunit
Using cached python_
Collecting testtools
Using cached testtools-
Requirement already satisfied: setuptools in ./lib/python3.
Collecting sphinx
Using cached sphinx-
Collecting sphinx-epytext
Using cached sphinx-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: gpg in /usr/lib/
Collecting pyinotify
Using cached pyinotify-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: httplib2 in /usr/lib/
Collecting keyring
Using cached keyring-
Requirement already satisfied: lazr.restfulcli
...
The Breezy Bot (the-breezy-bot) wrote : | # |
The attempt to merge lp:~jelmer/brz/python-compat into lp:brz/3.3 failed. Below is the output from the failed tests.
Collecting setuptools-gettext
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'
Preparing editable metadata (pyproject.toml): started
Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: patiencediff in /usr/lib/
Requirement already satisfied: dulwich>=0.20.23 in /usr/lib/
Requirement already satisfied: fastbencode in /usr/lib/
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: configobj in /usr/lib/
Requirement already satisfied: merge3 in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Collecting pyinotify
Downloading pyinotify-
━━
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/
Requirement already satisfied: setuptools in ./lib/python3.
Collecting sphinx-epytext
Downloading sphinx-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Collecting sphinx
Downloading sphinx-
━━
Collecting testtools
Downloading testtools-
━━
Collecting python-subunit
Downloading python_
━━
Collecting fastimport
Downloading fastimport-
━━
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: gpg in /usr/lib/
The Breezy Bot (the-breezy-bot) wrote : | # |
The attempt to merge lp:~jelmer/brz/python-compat into lp:brz/3.3 failed. Below is the output from the failed tests.
Collecting setuptools-gettext
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'
Preparing editable metadata (pyproject.toml): started
Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: merge3 in /usr/lib/
Requirement already satisfied: patiencediff in /usr/lib/
Requirement already satisfied: dulwich>=0.20.23 in /usr/lib/
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Requirement already satisfied: fastbencode in /usr/lib/
Requirement already satisfied: configobj in /usr/lib/
Collecting fastimport
Downloading fastimport-
━━
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/
Collecting testtools
Downloading testtools-
━━
Collecting python-subunit
Downloading python_
━━
Requirement already satisfied: gpg in /usr/lib/
Collecting sphinx
Downloading sphinx-
━━
Requirement already satisfied: setuptools in ./lib/python3.
Collecting sphinx-epytext
Downloading sphinx-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Collecting pyinotify
Downloading pyinotify-
━━
Preparing metadata (setup.py): started
Preparing metada...
The Breezy Bot (the-breezy-bot) wrote : | # |
The attempt to merge lp:~jelmer/brz/python-compat into lp:brz/3.3 failed. Command exited with 1.
Below is the output from the failed tests.
The virtual environment was not created successfully because ensurepip is not
available. On Debian/Ubuntu systems, you need to install the python3-venv
package using the following command.
apt install python3.10-venv
You may need to use sudo with that command. After installing the python3-venv
package, recreate your virtual environment.
Failing command: ['/tmp/
The Breezy Bot (the-breezy-bot) wrote : | # |
The attempt to merge lp:~jelmer/brz/python-compat into lp:brz/3.3 failed. Command exited with 1.
Below is the output from the failed tests.
Collecting setuptools-gettext
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'
Preparing editable metadata (pyproject.toml): started
Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Requirement already satisfied: dulwich>=0.20.23 in /usr/lib/
Requirement already satisfied: merge3 in /usr/lib/
Requirement already satisfied: fastbencode in /usr/lib/
Requirement already satisfied: patiencediff in /usr/lib/
Requirement already satisfied: configobj in /usr/lib/
Collecting python-subunit
Downloading python_
━━
Collecting testtools
Downloading testtools-
━━
Requirement already satisfied: gpg in /usr/lib/
Collecting fastimport
Downloading fastimport-
━━
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Collecting sphinx
Downloading sphinx-
━━
Collecting sphinx-epytext
Downloading sphinx-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: setuptools in ./lib/python3.
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/
Requirement already satisfied: httplib2 in /usr/lib/
Collecting keyring
Downloading keyring-
The Breezy Bot (the-breezy-bot) wrote : | # |
The attempt to merge lp:~jelmer/brz/python-compat into lp:brz/3.3 failed. Command exited with 1.
Below is the output from the failed tests.
Collecting setuptools-gettext
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'
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: dulwich>=0.20.23 in /usr/lib/
Requirement already satisfied: merge3 in /usr/lib/
Requirement already satisfied: fastbencode in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: patiencediff in /usr/lib/
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/
Collecting fastimport
Downloading fastimport-
━━
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Collecting sphinx
Downloading sphinx-
━━
Collecting sphinx-epytext
Downloading sphinx-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: setuptools in ./lib/python3.
Requirement already satisfied: gpg in /usr/lib/
Collecting python-subunit
Downloading python_
━━
Collecting testtools
Downloading testtools-
━━
Requirement already satisfied: httplib2 in /usr/lib/
Collecting keyring
Downloading keyring-
Unmerged revisions
- 7665. By Jelmer Vernooij
-
Drop python 2 compat code.
The attempt to merge lp:~jelmer/brz/python-compat into lp:brz/3.3 failed. Below is the output from the failed tests.
Collecting setuptools-gettext gettext- 0.1.1-py3- none-any. whl (10 kB) 10/site- packages (from setuptools-gettext) (65.5.0) gettext- 0.1.1 /tmp/tarmac/ branch. _6hf7_33 python3/ dist-packages (from breezy==3.3.1.dev0) (0.0.12) python3/ dist-packages (from breezy==3.3.1.dev0) (0.0.8) python3/ dist-packages (from breezy==3.3.1.dev0) (5.0.6) python3/ dist-packages (from breezy==3.3.1.dev0) (1.26.12) python3/ dist-packages (from breezy==3.3.1.dev0) (0.20.46) python3/ dist-packages (from breezy==3.3.1.dev0) (5.4.1) python3/ dist-packages (from breezy==3.3.1.dev0) (0.2.3) python3/ dist-packages (from breezy==3.3.1.dev0) (1.18.0) 0.9.6.tar. gz (60 kB) python3/ dist-packages (from breezy==3.3.1.dev0) (1.10.17) 2.5.0-py3- none-any. whl (181 kB) subunit- 1.4.0-py2. py3-none- any.whl (106 kB) 0.9.14. tar.gz (41 kB) epytext- 0.0.4.tar. gz (3.6 kB) 10/site- packages (from breezy==3.3.1.dev0) (65.5.0) 5.3.0-py3- none-any. whl (3.2 MB) python3/ dist-packages (from launchpadlib> =1.6.3- >breezy= =3.3.1. dev0) (0.20.4) 23.9.3- py3-none- any.whl (35 kB) ent>=0. 9.19 in /usr/lib/ python3/ dist-packages (from launchpadlib> =1.6.3- >breezy= =3.3.1. dev0) (0.14.5)
Using cached 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'
Preparing editable metadata (pyproject.toml): started
Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: fastbencode in /usr/lib/
Requirement already satisfied: merge3 in /usr/lib/
Requirement already satisfied: configobj in /usr/lib/
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: dulwich>=0.20.23 in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Requirement already satisfied: patiencediff in /usr/lib/
Requirement already satisfied: gpg in /usr/lib/
Collecting pyinotify
Using cached pyinotify-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/
Collecting testtools
Using cached testtools-
Collecting python-subunit
Using cached python_
Collecting fastimport
Using cached fastimport-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Collecting sphinx-epytext
Using cached sphinx-
Preparing metadata (setup.py): started
Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: setuptools in ./lib/python3.
Collecting sphinx
Using cached sphinx-
Requirement already satisfied: httplib2 in /usr/lib/
Collecting keyring
Using cached keyring-
Requirement already satisfied: lazr.restfulcli
...