Breezy

Merge lp:~vila/brz/3.0.1 into lp:brz/3.0

  1. 3.0.1
  2. Merge into 3.0
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~vila/brz/3.0.1
Merge into: lp:brz/3.0
Diff against target: 205 lines (+47/-23)
10 files modified
breezy/__init__.py (+1/-1)
breezy/bzr/remote.py (+2/-2)
breezy/git/tests/test_blackbox.py (+23/-9)
breezy/plugins/propose/launchpad.py (+2/-2)
brz (+1/-1)
byov.conf (+9/-2)
doc/en/release-notes/brz-3.0.txt (+4/-1)
tools/check-newsbugs.py (+1/-1)
tools/fixed-in.py (+3/-3)
tools/prepare_for_latex.py (+1/-1)
To merge this branch: bzr merge lp:~vila/brz/3.0.1
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+368887@code.launchpad.net

Commit message

Release 3.0.1

Description of the change

3.0.1 release

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

RM self-stamp

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/__init__.py'
2--- breezy/__init__.py 2019-03-06 11:06:58 +0000
3+++ breezy/__init__.py 2019-06-16 21:55:14 +0000
4@@ -50,7 +50,7 @@
5 # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
6 # releaselevel of 'dev' for unreleased under-development code.
7
8-version_info = (3, 0, 0, 'final', 0)
9+version_info = (3, 0, 1, 'final', 0)
10
11
12 def _format_version_tuple(version_info):
13
14=== modified file 'breezy/bzr/remote.py'
15--- breezy/bzr/remote.py 2019-06-01 02:04:54 +0000
16+++ breezy/bzr/remote.py 2019-06-16 21:55:14 +0000
17@@ -1388,8 +1388,8 @@
18 if e.error_tuple[:2] != (b'error', b'ValueError'):
19 raise
20 m = re.match(
21- b"requested revno \(([0-9]+)\) is later than given "
22- b"known revno \(([0-9]+)\)", e.error_tuple[2])
23+ br"requested revno \(([0-9]+)\) is later than given "
24+ br"known revno \(([0-9]+)\)", e.error_tuple[2])
25 if not m:
26 raise
27 raise errors.RevnoOutOfBounds(
28
29=== modified file 'breezy/git/tests/test_blackbox.py'
30--- breezy/git/tests/test_blackbox.py 2019-05-28 23:19:33 +0000
31+++ breezy/git/tests/test_blackbox.py 2019-06-16 21:55:14 +0000
32@@ -197,15 +197,29 @@
33 tree.add(['a'])
34 output, error = self.run_bzr(['diff', '--format=git'], retcode=1)
35 self.assertEqual(error, '')
36- self.assertEqual(output,
37- 'diff --git a/a b/a\n'
38- 'old file mode 0\n'
39- 'new file mode 100644\n'
40- 'index 0000000..c197bd8 100644\n'
41- '--- /dev/null\n'
42- '+++ b/a\n'
43- '@@ -0,0 +1 @@\n'
44- '+contents of a\n')
45+ # Some older versions of Dulwich (< 0.19.12) formatted diffs slightly
46+ # differently.
47+ from dulwich import __version__ as dulwich_version
48+ if dulwich_version < (0, 19, 12):
49+ self.assertEqual(output,
50+ 'diff --git /dev/null b/a\n'
51+ 'old mode 0\n'
52+ 'new mode 100644\n'
53+ 'index 0000000..c197bd8 100644\n'
54+ '--- /dev/null\n'
55+ '+++ b/a\n'
56+ '@@ -0,0 +1 @@\n'
57+ '+contents of a\n')
58+ else:
59+ self.assertEqual(output,
60+ 'diff --git a/a b/a\n'
61+ 'old file mode 0\n'
62+ 'new file mode 100644\n'
63+ 'index 0000000..c197bd8 100644\n'
64+ '--- /dev/null\n'
65+ '+++ b/a\n'
66+ '@@ -0,0 +1 @@\n'
67+ '+contents of a\n')
68
69 def test_git_import_uncolocated(self):
70 r = GitRepo.init("a", mkdir=True)
71
72=== modified file 'breezy/plugins/propose/launchpad.py'
73--- breezy/plugins/propose/launchpad.py 2019-02-17 02:00:36 +0000
74+++ breezy/plugins/propose/launchpad.py 2019-06-16 21:55:14 +0000
75@@ -72,8 +72,8 @@
76 return False
77 if url.startswith('lp:'):
78 return True
79- regex = re.compile('([a-z]*\+)*(bzr\+ssh|http|ssh|git|https)'
80- '://(bazaar|git).*.launchpad.net')
81+ regex = re.compile(r'([a-z]*\+)*(bzr\+ssh|http|ssh|git|https)'
82+ r'://(bazaar|git).*.launchpad.net')
83 return bool(regex.match(url))
84
85
86
87=== modified file 'brz'
88--- brz 2018-11-18 12:41:12 +0000
89+++ brz 2019-06-16 21:55:14 +0000
90@@ -25,7 +25,7 @@
91 import warnings
92
93 # update this on each release
94-_script_version = (3, 0, 0)
95+_script_version = (3, 0, 1)
96
97 NEED_VERS = (2, 7)
98
99
100=== modified file 'byov.conf'
101--- byov.conf 2019-05-28 21:46:53 +0000
102+++ byov.conf 2019-06-16 21:55:14 +0000
103@@ -27,7 +27,7 @@
104
105 # FIXME: Arguably this should be vm.build_deps=brz but it requires either an
106 # available package or at least a debian/ dir ? -- vila 2018-02-23
107-brz.build_deps = gcc, debhelper, python, python-all-dev, python3-all-dev, python-configobj, python3-configobj, python-docutils, python3-docutils, python-paramiko, python3-paramiko, python-subunit, python3-subunit, python-testtools, python3-testtools, subunit, python-pip, python3-pip, python-setuptools, python3-setuptools, python-flake8, python3-flake8, python-sphinx, python3-sphinx, python-launchpadlib, python3-launchpadlib
108+brz.build_deps = gcc, debhelper, python, python-all-dev, python3-all-dev, python-configobj, python3-configobj, python-docutils, python3-docutils, python-paramiko, python3-paramiko, python-subunit, python3-subunit, python-testtools, python3-testtools, subunit, python-pip, python3-pip, python-setuptools, python3-setuptools, python-flake8, python3-flake8, python-sphinx, python3-sphinx, python-launchpadlib, python3-launchpadlib, cython, cython3
109 subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtools, python3-testtools
110 vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml
111 [brz-xenial]
112@@ -39,12 +39,19 @@
113 vm.release = bionic
114 [brz-cosmic]
115 vm.release = cosmic
116+[brz-disco]
117+vm.release = disco
118+vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-dulwich, python3-dulwich, python-junitxml
119+byoci.setup.command = ({subunit.clone} && {sphinx_epytext.install} && {sphinx_epytext.install3} )
120+byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"
121+[brz-eoan]
122+vm.release = eoan
123 lxd.image = ubuntu-daily:{vm.release}/{vm.architecture}
124 [brz-buster]
125 vm.distribution = debian
126 vm.release = buster
127 vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-dulwich, python3-dulwich, python-junitxml
128-byoci.setup.command = ({subunit.clone})
129+byoci.setup.command = ({subunit.clone} && {sphinx_epytext.install} && {sphinx_epytext.install3} )
130 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"
131 [brz-sid]
132 vm.distribution = debian
133
134=== modified file 'doc/en/release-notes/brz-3.0.txt'
135--- doc/en/release-notes/brz-3.0.txt 2019-06-16 20:44:51 +0000
136+++ doc/en/release-notes/brz-3.0.txt 2019-06-16 21:55:14 +0000
137@@ -8,8 +8,11 @@
138 bzr 3.0.1
139 #########
140
141-:3.0.1: NOT RELEASED YET
142+:3.0.1: 2019-06-16
143
144+brz 3.0.1 is the second release of ``Breezy``, a fork of Bazaar. For more
145+information, see our release announcement on the Bazaar mailing list and
146+README.
147
148 External Compatibility Breaks
149 *****************************
150
151=== modified file 'tools/check-newsbugs.py'
152--- tools/check-newsbugs.py 2018-11-18 19:48:57 +0000
153+++ tools/check-newsbugs.py 2019-06-16 21:55:14 +0000
154@@ -52,7 +52,7 @@
155 :return: list of bug numbers that were closed.
156 """
157 # Pattern to find bug numbers
158- bug_pattern = re.compile("\#([0-9]+)")
159+ bug_pattern = re.compile(r"\#([0-9]+)")
160 ret = set()
161 with open(path, 'r') as f:
162 section = ""
163
164=== modified file 'tools/fixed-in.py'
165--- tools/fixed-in.py 2018-11-17 17:37:42 +0000
166+++ tools/fixed-in.py 2019-06-16 21:55:14 +0000
167@@ -10,7 +10,7 @@
168
169 class NewsParser(object):
170
171- paren_exp_re = re.compile('\(([^)]+)\)')
172+ paren_exp_re = re.compile(r'\(([^)]+)\)')
173 release_re = re.compile("brz[ -]")
174 release_prefix_length = len('brz ')
175 bugs_re = re.compile('#([0-9]+)')
176@@ -51,14 +51,14 @@
177 def try_date(self):
178 if self.release is None:
179 return False
180- date_re = re.compile(':%s: (NOT RELEASED YET|\d{4}-\d{2}-\d{2})'
181+ date_re = re.compile(r':%s: (NOT RELEASED YET|\d{4}-\d{2}-\d{2})'
182 % (self.release,))
183 match = date_re.match(self.lrs)
184 if match is not None:
185 self.date = match.group(1)
186 return True
187 # The old fashion way
188- released_re = re.compile(':Released:\s+(\d{4}-\d{2}-\d{2})')
189+ released_re = re.compile(r':Released:\s+(\d{4}-\d{2}-\d{2})')
190 match = released_re.match(self.lrs)
191 if match is not None:
192 self.date = match.group(1)
193
194=== modified file 'tools/prepare_for_latex.py'
195--- tools/prepare_for_latex.py 2018-11-17 16:19:11 +0000
196+++ tools/prepare_for_latex.py 2019-06-16 21:55:14 +0000
197@@ -37,7 +37,7 @@
198
199 verbose = False
200
201-IMAGE_DIRECTIVE_PATTERN = re.compile(u'^..\\s+image::\\s+(.*)\`\s+$')
202+IMAGE_DIRECTIVE_PATTERN = re.compile(u'^..\\s+image::\\s+(.*)\\`\\s+$')
203 DIRECTIVE_ELEMENT_PATTERN = re.compile(u'^\\s+:[^:]+:\\s+')
204
205 class Converter(object):

Subscribers

People subscribed via source and target branches