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
=== modified file 'breezy/__init__.py'
--- breezy/__init__.py 2019-03-06 11:06:58 +0000
+++ breezy/__init__.py 2019-06-16 21:55:14 +0000
@@ -50,7 +50,7 @@
50# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a50# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
51# releaselevel of 'dev' for unreleased under-development code.51# releaselevel of 'dev' for unreleased under-development code.
5252
53version_info = (3, 0, 0, 'final', 0)53version_info = (3, 0, 1, 'final', 0)
5454
5555
56def _format_version_tuple(version_info):56def _format_version_tuple(version_info):
5757
=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py 2019-06-01 02:04:54 +0000
+++ breezy/bzr/remote.py 2019-06-16 21:55:14 +0000
@@ -1388,8 +1388,8 @@
1388 if e.error_tuple[:2] != (b'error', b'ValueError'):1388 if e.error_tuple[:2] != (b'error', b'ValueError'):
1389 raise1389 raise
1390 m = re.match(1390 m = re.match(
1391 b"requested revno \(([0-9]+)\) is later than given "1391 br"requested revno \(([0-9]+)\) is later than given "
1392 b"known revno \(([0-9]+)\)", e.error_tuple[2])1392 br"known revno \(([0-9]+)\)", e.error_tuple[2])
1393 if not m:1393 if not m:
1394 raise1394 raise
1395 raise errors.RevnoOutOfBounds(1395 raise errors.RevnoOutOfBounds(
13961396
=== modified file 'breezy/git/tests/test_blackbox.py'
--- breezy/git/tests/test_blackbox.py 2019-05-28 23:19:33 +0000
+++ breezy/git/tests/test_blackbox.py 2019-06-16 21:55:14 +0000
@@ -197,15 +197,29 @@
197 tree.add(['a'])197 tree.add(['a'])
198 output, error = self.run_bzr(['diff', '--format=git'], retcode=1)198 output, error = self.run_bzr(['diff', '--format=git'], retcode=1)
199 self.assertEqual(error, '')199 self.assertEqual(error, '')
200 self.assertEqual(output,200 # Some older versions of Dulwich (< 0.19.12) formatted diffs slightly
201 'diff --git a/a b/a\n'201 # differently.
202 'old file mode 0\n'202 from dulwich import __version__ as dulwich_version
203 'new file mode 100644\n'203 if dulwich_version < (0, 19, 12):
204 'index 0000000..c197bd8 100644\n'204 self.assertEqual(output,
205 '--- /dev/null\n'205 'diff --git /dev/null b/a\n'
206 '+++ b/a\n'206 'old mode 0\n'
207 '@@ -0,0 +1 @@\n'207 'new mode 100644\n'
208 '+contents of a\n')208 'index 0000000..c197bd8 100644\n'
209 '--- /dev/null\n'
210 '+++ b/a\n'
211 '@@ -0,0 +1 @@\n'
212 '+contents of a\n')
213 else:
214 self.assertEqual(output,
215 'diff --git a/a b/a\n'
216 'old file mode 0\n'
217 'new file mode 100644\n'
218 'index 0000000..c197bd8 100644\n'
219 '--- /dev/null\n'
220 '+++ b/a\n'
221 '@@ -0,0 +1 @@\n'
222 '+contents of a\n')
209223
210 def test_git_import_uncolocated(self):224 def test_git_import_uncolocated(self):
211 r = GitRepo.init("a", mkdir=True)225 r = GitRepo.init("a", mkdir=True)
212226
=== modified file 'breezy/plugins/propose/launchpad.py'
--- breezy/plugins/propose/launchpad.py 2019-02-17 02:00:36 +0000
+++ breezy/plugins/propose/launchpad.py 2019-06-16 21:55:14 +0000
@@ -72,8 +72,8 @@
72 return False72 return False
73 if url.startswith('lp:'):73 if url.startswith('lp:'):
74 return True74 return True
75 regex = re.compile('([a-z]*\+)*(bzr\+ssh|http|ssh|git|https)'75 regex = re.compile(r'([a-z]*\+)*(bzr\+ssh|http|ssh|git|https)'
76 '://(bazaar|git).*.launchpad.net')76 r'://(bazaar|git).*.launchpad.net')
77 return bool(regex.match(url))77 return bool(regex.match(url))
7878
7979
8080
=== modified file 'brz'
--- brz 2018-11-18 12:41:12 +0000
+++ brz 2019-06-16 21:55:14 +0000
@@ -25,7 +25,7 @@
25import warnings25import warnings
2626
27# update this on each release27# update this on each release
28_script_version = (3, 0, 0)28_script_version = (3, 0, 1)
2929
30NEED_VERS = (2, 7)30NEED_VERS = (2, 7)
3131
3232
=== modified file 'byov.conf'
--- byov.conf 2019-05-28 21:46:53 +0000
+++ byov.conf 2019-06-16 21:55:14 +0000
@@ -27,7 +27,7 @@
2727
28# FIXME: Arguably this should be vm.build_deps=brz but it requires either an28# FIXME: Arguably this should be vm.build_deps=brz but it requires either an
29# available package or at least a debian/ dir ? -- vila 2018-02-2329# available package or at least a debian/ dir ? -- vila 2018-02-23
30brz.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-launchpadlib30brz.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
31subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtools, python3-testtools31subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtools, python3-testtools
32vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml32vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml
33[brz-xenial]33[brz-xenial]
@@ -39,12 +39,19 @@
39vm.release = bionic39vm.release = bionic
40[brz-cosmic]40[brz-cosmic]
41vm.release = cosmic41vm.release = cosmic
42[brz-disco]
43vm.release = disco
44vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-dulwich, python3-dulwich, python-junitxml
45byoci.setup.command = ({subunit.clone} && {sphinx_epytext.install} && {sphinx_epytext.install3} )
46byoci.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)"
47[brz-eoan]
48vm.release = eoan
42lxd.image = ubuntu-daily:{vm.release}/{vm.architecture}49lxd.image = ubuntu-daily:{vm.release}/{vm.architecture}
43[brz-buster]50[brz-buster]
44vm.distribution = debian51vm.distribution = debian
45vm.release = buster52vm.release = buster
46vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-dulwich, python3-dulwich, python-junitxml53vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-dulwich, python3-dulwich, python-junitxml
47byoci.setup.command = ({subunit.clone})54byoci.setup.command = ({subunit.clone} && {sphinx_epytext.install} && {sphinx_epytext.install3} )
48byoci.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)"55byoci.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)"
49[brz-sid]56[brz-sid]
50vm.distribution = debian57vm.distribution = debian
5158
=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt 2019-06-16 20:44:51 +0000
+++ doc/en/release-notes/brz-3.0.txt 2019-06-16 21:55:14 +0000
@@ -8,8 +8,11 @@
8bzr 3.0.18bzr 3.0.1
9#########9#########
1010
11:3.0.1: NOT RELEASED YET11:3.0.1: 2019-06-16
1212
13brz 3.0.1 is the second release of ``Breezy``, a fork of Bazaar. For more
14information, see our release announcement on the Bazaar mailing list and
15README.
1316
14External Compatibility Breaks17External Compatibility Breaks
15*****************************18*****************************
1619
=== modified file 'tools/check-newsbugs.py'
--- tools/check-newsbugs.py 2018-11-18 19:48:57 +0000
+++ tools/check-newsbugs.py 2019-06-16 21:55:14 +0000
@@ -52,7 +52,7 @@
52 :return: list of bug numbers that were closed.52 :return: list of bug numbers that were closed.
53 """53 """
54 # Pattern to find bug numbers54 # Pattern to find bug numbers
55 bug_pattern = re.compile("\#([0-9]+)")55 bug_pattern = re.compile(r"\#([0-9]+)")
56 ret = set()56 ret = set()
57 with open(path, 'r') as f:57 with open(path, 'r') as f:
58 section = ""58 section = ""
5959
=== modified file 'tools/fixed-in.py'
--- tools/fixed-in.py 2018-11-17 17:37:42 +0000
+++ tools/fixed-in.py 2019-06-16 21:55:14 +0000
@@ -10,7 +10,7 @@
1010
11class NewsParser(object):11class NewsParser(object):
1212
13 paren_exp_re = re.compile('\(([^)]+)\)')13 paren_exp_re = re.compile(r'\(([^)]+)\)')
14 release_re = re.compile("brz[ -]")14 release_re = re.compile("brz[ -]")
15 release_prefix_length = len('brz ')15 release_prefix_length = len('brz ')
16 bugs_re = re.compile('#([0-9]+)')16 bugs_re = re.compile('#([0-9]+)')
@@ -51,14 +51,14 @@
51 def try_date(self):51 def try_date(self):
52 if self.release is None:52 if self.release is None:
53 return False53 return False
54 date_re = re.compile(':%s: (NOT RELEASED YET|\d{4}-\d{2}-\d{2})'54 date_re = re.compile(r':%s: (NOT RELEASED YET|\d{4}-\d{2}-\d{2})'
55 % (self.release,))55 % (self.release,))
56 match = date_re.match(self.lrs)56 match = date_re.match(self.lrs)
57 if match is not None:57 if match is not None:
58 self.date = match.group(1)58 self.date = match.group(1)
59 return True59 return True
60 # The old fashion way60 # The old fashion way
61 released_re = re.compile(':Released:\s+(\d{4}-\d{2}-\d{2})')61 released_re = re.compile(r':Released:\s+(\d{4}-\d{2}-\d{2})')
62 match = released_re.match(self.lrs)62 match = released_re.match(self.lrs)
63 if match is not None:63 if match is not None:
64 self.date = match.group(1)64 self.date = match.group(1)
6565
=== modified file 'tools/prepare_for_latex.py'
--- tools/prepare_for_latex.py 2018-11-17 16:19:11 +0000
+++ tools/prepare_for_latex.py 2019-06-16 21:55:14 +0000
@@ -37,7 +37,7 @@
3737
38verbose = False38verbose = False
3939
40IMAGE_DIRECTIVE_PATTERN = re.compile(u'^..\\s+image::\\s+(.*)\`\s+$')40IMAGE_DIRECTIVE_PATTERN = re.compile(u'^..\\s+image::\\s+(.*)\\`\\s+$')
41DIRECTIVE_ELEMENT_PATTERN = re.compile(u'^\\s+:[^:]+:\\s+')41DIRECTIVE_ELEMENT_PATTERN = re.compile(u'^\\s+:[^:]+:\\s+')
4242
43class Converter(object):43class Converter(object):

Subscribers

People subscribed via source and target branches