Merge lp:~vila/bzr/2.7-integration into lp:bzr/2.7

Proposed by Vincent Ladeuil on 2017-01-15
Status: Merged
Approved by: Vincent Ladeuil on 2017-01-15
Approved revision: 6619
Merged at revision: 6619
Proposed branch: lp:~vila/bzr/2.7-integration
Merge into: lp:bzr/2.7
Diff against target: 94 lines (+17/-7)
4 files modified
bzr (+2/-2)
bzrlib/__init__.py (+2/-2)
doc/developers/releasing.txt (+6/-3)
doc/en/release-notes/bzr-2.7.txt (+7/-0)
To merge this branch: bzr merge lp:~vila/bzr/2.7-integration
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve on 2017-01-15
Review via email: mp+314784@code.launchpad.net

Commit message

Open 2.7.1 for bug fixes.

Description of the change

Properly open 2.7.1 for bug fixing.

To post a comment you must log in.
Vincent Ladeuil (vila) wrote :

Administrativia.

review: Approve
bzr PQM (bzr-pqm) wrote :
Download full text (3.1 MiB)

The attempt to merge lp:~vila/bzr/2.7-integration into lp:bzr/2.7 failed. Below is the output from the failed tests.

python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/en/tutorials/tutorial.txt "doc/en/tutorials/tutorial.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/en/tutorials/using_bazaar_with_launchpad.txt "doc/en/tutorials/using_bazaar_with_launchpad.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/en/tutorials/centralized_workflow.txt "doc/en/tutorials/centralized_workflow.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ru/tutorials/centralized_workflow.txt "doc/ru/tutorials/centralized_workflow.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ru/tutorials/using_bazaar_with_launchpad.txt "doc/ru/tutorials/using_bazaar_with_launchpad.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ru/tutorials/tutorial.txt "doc/ru/tutorials/tutorial.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ja/tutorials/tutorial.txt "doc/ja/tutorials/tutorial.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ja/tutorials/using_bazaar_with_launchpad.txt "doc/ja/tutorials/using_bazaar_with_launchpad.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ja/tutorials/centralized_workflow.txt "doc/ja/tutorials/centralized_workflow.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/en/mini-tutorial/index.txt "doc/en/mini-tutorial/index.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ja/mini-tutorial/index.txt "doc/ja/mini-tutorial/index.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ru/mini-tutorial/index.txt "doc/ru/mini-tutorial/index.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/es/mini-tutorial/index.txt "doc/es/mini-tutorial/index.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/en/user-guide/index-plain.txt doc/en/user-guide/index-plain.html
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ja/user-guide/index-plain.txt "doc/ja/user-guide/index-plain.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=...

Vincent Ladeuil (vila) wrote :

18:29:13 O: ======================================================================
18:29:13 O: ERROR: bzrlib.tests.test_test_server.TestTCPServerInAThread.test_handle_request_closes_if_it_doesnt_process(TestingTCPServer)
18:29:13 O: ----------------------------------------------------------------------
18:29:13 O: Traceback (most recent call last):
18:29:13 O: testtools.testresult.real._StringException: Empty attachments:
18:29:13 O: log
18:29:13 O:
18:29:13 O: Traceback (most recent call last):
18:29:13 O: File "/home/ubuntu/work/bzrlib/tests/test_test_server.py", line 291, in test_handle_request_closes_if_it_doesnt_process
18:29:13 O: client.connect((server.host, server.port))
18:29:13 O: File "/home/ubuntu/work/bzrlib/tests/test_test_server.py", line 58, in connect
18:29:13 O: self.sock = osutils.connect_socket(addr)
18:29:13 O: File "/home/ubuntu/work/bzrlib/osutils.py", line 2196, in connect_socket
18:29:13 O: raise err
18:29:13 O: socket.error: [Errno 111] Connection refused

Transient failure ?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzr'
2--- bzr 2013-07-27 12:53:28 +0000
3+++ bzr 2017-01-15 18:21:11 +0000
4@@ -1,6 +1,6 @@
5 #! /usr/bin/env python
6
7-# Copyright (C) 2005-2012 Canonical Ltd
8+# Copyright (C) 2005-2013, 2017 Canonical Ltd
9 #
10 # This program is free software; you can redistribute it and/or modify
11 # it under the terms of the GNU General Public License as published by
12@@ -25,7 +25,7 @@
13 import warnings
14
15 # update this on each release
16-_script_version = (2, 7, 0)
17+_script_version = (2, 7, 1)
18
19 NEED_VERS = (2, 6)
20
21
22=== modified file 'bzrlib/__init__.py'
23--- bzrlib/__init__.py 2016-02-01 18:09:33 +0000
24+++ bzrlib/__init__.py 2017-01-15 18:21:11 +0000
25@@ -1,4 +1,4 @@
26-# Copyright (C) 2005-2013, 2016 Canonical Ltd
27+# Copyright (C) 2005-2013, 2016, 2017 Canonical Ltd
28 #
29 # This program is free software; you can redistribute it and/or modify
30 # it under the terms of the GNU General Public License as published by
31@@ -55,7 +55,7 @@
32 # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
33 # releaselevel of 'dev' for unreleased under-development code.
34
35-version_info = (2, 7, 0, 'final', 0)
36+version_info = (2, 7, 1, 'dev', 0)
37
38 # API compatibility version
39 api_minimum_version = (2, 4, 0)
40
41=== modified file 'doc/developers/releasing.txt'
42--- doc/developers/releasing.txt 2016-02-07 18:23:13 +0000
43+++ doc/developers/releasing.txt 2017-01-15 18:21:11 +0000
44@@ -551,12 +551,12 @@
45 <http://doc.bazaar.canonical.com>. It should be automatically build when
46 the branch is created, by a cron script ``update-bzr-docs`` on
47 ``escudero``. When the first release is created in a new series, a branch
48- needs to be created on zhongshan::
49+ needs to be created on ``escudero``::
50
51- ssh zhongshan.canonical.com
52+ ssh escudero.canonical.com
53 sudo -u bzr-web -s
54 cd /srv/doc.bazaar.canonical.com/
55- bzr branch http://bazaar.launchpad.net/~bzr-pqm/bzr/2.6 bzr/bzr.2.6
56+ bzr branch lp:bzr/2.7 bzr/bzr.2.7
57
58 And the ``bzr/bin/update-bzr-docs`` script needs to refer to it.
59
60@@ -649,6 +649,9 @@
61 Remember to check the results afterward -- this should be done for
62 stable releases but not for beta releases nor SRUs.
63
64+ The ``twine`` command is provided by the ``twine`` package on Debian and
65+ Ubuntu.
66+
67 If in doubt, you can test with <https://testpypi.python.org/pypi> where
68 you can register yourself, register the bzr project and upload (and then
69 remove the upload and delete the project so a new release manager can
70
71=== modified file 'doc/en/release-notes/bzr-2.7.txt'
72--- doc/en/release-notes/bzr-2.7.txt 2016-11-27 09:54:23 +0000
73+++ doc/en/release-notes/bzr-2.7.txt 2017-01-15 18:21:11 +0000
74@@ -8,6 +8,8 @@
75 bzr 2.7.1
76 #########
77
78+:2.7.1: NOT RELEASED YET
79+
80
81 Bug Fixes
82 *********
83@@ -15,6 +17,11 @@
84 * Cope with paramiko making argument to SFTPFile.prefetch() mandatory.
85 (Jelmer Vernooij, #1579093)
86
87+Documentation
88+*************
89+
90+* Clarify pypi uploads for releases. (Vincent Ladeuil, #1542903)
91+
92
93 bzr 2.7.0
94 #########

Subscribers

People subscribed via source and target branches