Breezy

Merge lp:brz/3.3 into lp:brz

  1. 3.3
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 7725
Merged at revision: 7668
Proposed branch: lp:brz/3.3
Merge into: lp:brz
Diff against target: 119 lines (+17/-9)
6 files modified
.github/workflows/pythonpackage.yml (+1/-1)
.github/workflows/wheels.yaml (+3/-1)
breezy/bzr/tests/test_transform.py (+2/-2)
breezy/tests/per_workingtree/test_canonical_path.py (+9/-0)
breezy/tests/per_workingtree/test_workingtree.py (+1/-4)
breezy/tests/test_msgeditor.py (+1/-1)
To merge this branch: bzr merge lp:brz/3.3
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+432610@code.launchpad.net

Commit message

Merge lp:brz/3.3

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :
Download full text (13.6 KiB)

The attempt to merge lp:brz/3.3 into lp:brz failed. Command exited with 142.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.0baocb6n
  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: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.46)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.4.1)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Requirement already satisfied: paramiko in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (2.10.4)
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.10.17)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.18.0)
Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.1.dev0) (65.5.0)
Collecting sphinx-epytext
  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 sphinx
  Downloading sphinx-5.3.0-py3-none-any.whl (3.2 MB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.2/3.2 MB 6.6 MB/s eta 0:00:00
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 3.4 MB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting testtools
  Downloading testtools-2.5.0-py3-none-any.whl (181 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 182.0/182.0 kB 2.9 MB/s eta 0:00:00
Collecting python-subunit
  Downloading python_subunit-1.4.1-py3-none-any.whl (106 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 106.7/106.7 kB 4.1 MB/s eta 0:00:00
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3...

lp:brz/3.3 updated
7725. By Jelmer Vernooij

github-action: Build on python 3.11.

by jelmer review by jelmer

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.github/workflows/pythonpackage.yml'
2--- .github/workflows/pythonpackage.yml 2022-10-30 13:29:41 +0000
3+++ .github/workflows/pythonpackage.yml 2022-11-07 11:27:32 +0000
4@@ -10,7 +10,7 @@
5 strategy:
6 matrix:
7 os: [ubuntu-latest]
8- python-version: [3.7, 3.8, 3.9, "3.10"]
9+ python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
10 experimental: [false]
11 include:
12 - os: macos-latest
13
14=== modified file '.github/workflows/wheels.yaml'
15--- .github/workflows/wheels.yaml 2022-11-04 19:36:54 +0000
16+++ .github/workflows/wheels.yaml 2022-11-07 11:27:32 +0000
17@@ -43,7 +43,9 @@
18 - name: Build wheels
19 run: python -m cibuildwheel --output-dir wheelhouse
20 env:
21- CIBW_ARCHS_LINUX: x86_64 aarch64
22+ CIBW_ARCHS_LINUX: x86_64
23+ # ARM builds fail at the moment:
24+ # CIBW_ARCHS_LINUX: x86_64 aarch64
25 CIBW_ARCHS_MACOS: x86_64 arm64 universal2
26 CIBW_SKIP: '*-win32'
27 CIBW_ENVIRONMENT: 'PATH="$HOME/.cargo/bin:$PATH"'
28
29=== modified file 'breezy/bzr/tests/test_transform.py'
30--- breezy/bzr/tests/test_transform.py 2022-07-02 13:44:01 +0000
31+++ breezy/bzr/tests/test_transform.py 2022-11-07 11:27:32 +0000
32@@ -18,7 +18,7 @@
33 import os
34 import time
35
36-from ...tests import features
37+from ...tests import features, UnavailableFeature
38 from ... import errors, filters, osutils, rules
39 from ...controldir import ControlDir
40 from ..conflicts import DuplicateEntry
41@@ -414,7 +414,7 @@
42 def test_case_insensitive_build_tree_inventory(self):
43 if (features.CaseInsensitiveFilesystemFeature.available()
44 or features.CaseInsCasePresFilenameFeature.available()):
45- raise tests.UnavailableFeature('Fully case sensitive filesystem')
46+ raise UnavailableFeature('Fully case sensitive filesystem')
47 source = self.make_branch_and_tree('source')
48 self.build_tree(['source/file', 'source/FILE'])
49 source.add(['file', 'FILE'], ids=[b'lower-id', b'upper-id'])
50
51=== modified file 'breezy/tests/per_workingtree/test_canonical_path.py'
52--- breezy/tests/per_workingtree/test_canonical_path.py 2021-02-19 22:54:46 +0000
53+++ breezy/tests/per_workingtree/test_canonical_path.py 2022-11-07 11:27:32 +0000
54@@ -46,6 +46,8 @@
55 if features.CaseInsensitiveFilesystemFeature.available():
56 self.assertEqual('dir/file',
57 work_tree.get_canonical_path('Dir/File'))
58+ elif features.CaseInsCasePresFilenameFeature.available():
59+ self.assertEqual('dir/file', work_tree.get_canonical_path('Dir/File'))
60 else:
61 self.assertEqual('Dir/File',
62 work_tree.get_canonical_path('Dir/File'))
63@@ -55,6 +57,9 @@
64 if features.CaseInsensitiveFilesystemFeature.available():
65 self.assertEqual('dir/file',
66 work_tree.get_canonical_path('Dir/File'))
67+ elif features.CaseInsCasePresFilenameFeature.available():
68+ self.assertEqual('dir/file',
69+ work_tree.get_canonical_path('Dir/File'))
70 else:
71 self.assertEqual('Dir/File',
72 work_tree.get_canonical_path('Dir/File'))
73@@ -64,6 +69,8 @@
74 work_tree = self._make_canonical_test_tree()
75 if features.CaseInsensitiveFilesystemFeature.available():
76 self.assertEqual('dir', work_tree.get_canonical_path('Dir'))
77+ elif features.CaseInsCasePresFilenameFeature.available():
78+ self.assertEqual('dir', work_tree.get_canonical_path('Dir'))
79 else:
80 self.assertEqual('Dir', work_tree.get_canonical_path('Dir'))
81
82@@ -82,6 +89,8 @@
83 if features.CaseInsensitiveFilesystemFeature.available():
84 self.assertEqual('dir/None',
85 work_tree.get_canonical_path('Dir/None'))
86+ elif features.CaseInsCasePresFilenameFeature.available():
87+ self.assertEqual('dir/None', work_tree.get_canonical_path('Dir/None'))
88 else:
89 self.assertEqual('Dir/None',
90 work_tree.get_canonical_path('Dir/None'))
91
92=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
93--- breezy/tests/per_workingtree/test_workingtree.py 2022-09-08 14:15:34 +0000
94+++ breezy/tests/per_workingtree/test_workingtree.py 2022-11-07 11:27:32 +0000
95@@ -1052,10 +1052,7 @@
96 then testing whether it exists with an uppercase name.
97 """
98 self.build_tree(['filename'])
99- if os.path.exists('FILENAME'):
100- case_sensitive = False
101- else:
102- case_sensitive = True
103+ case_sensitive = not features.CaseInsensitiveFilesystemFeature.available()
104 tree = self.make_branch_and_tree('test')
105 self.assertEqual(case_sensitive, tree.case_sensitive)
106 if not isinstance(tree, InventoryWorkingTree):
107
108=== modified file 'breezy/tests/test_msgeditor.py'
109--- breezy/tests/test_msgeditor.py 2022-08-22 18:19:46 +0000
110+++ breezy/tests/test_msgeditor.py 2022-11-07 11:27:32 +0000
111@@ -198,7 +198,7 @@
112 else:
113 # [non-win32] make python script executable and set BRZ_EDITOR
114 os.chmod('fed.py', 0o755)
115- self.overrideEnv('BRZ_EDITOR', './fed.py')
116+ self.overrideEnv('BRZ_EDITOR', '%s ./fed.py' % sys.executable)
117
118 def test_edit_commit_message_without_infotext(self):
119 self.make_uncommitted_tree()

Subscribers

People subscribed via source and target branches