25
24
#. Download the pqm plugin and install it into your ``~/.bazaar/plugins``::
27
26
bzr branch lp:bzr-pqm ~/.bazaar/plugins/pqm
33
As of October 2010, we mantain four series. Concurrently releasing them
34
all at the same time makes it harder to shorten the delay between the
35
source availability and the package building longer than necessary (we
36
delay the official announcement until most of our users can install the new
39
In order to continue to do time-based releases, we need to plan the
40
releases by series to minimize the collisions. In the end, it's the Release
41
Manager call to decide whether he prefers to do all releases at once
42
though, so the rules presented here are a conservative approach.
44
We want to respect the following rules::
46
#. as much as possible releases should not disturb development, and
47
ongoing development should not disturb releases,
49
#. the most recent development series should release once a month during
50
the beta period (see `Development cycles <cycle.html>`_ for more
53
#. the most recent stable series should release every other month (based
54
on the amount of bug fixes, this can be shorter or longer depending on
57
#. previous series should relesase on a regular basis without interfering
58
with the most recent series with a decreasing order of priority (again
59
this should be based on bugs importance and user feedback),
61
#. the death of a series should be planned ahead of time. 6 months should
62
give enough time to our users to migrate to a more recent series. This
63
doesn't mean we will make a release at the end of the series, just that
64
before the end date we _could_ possibly put out another release if
65
there was a sufficiently important fix. Beyond that date, we won't
66
even land changes on that branch (unless something causes a miraculous
69
#. there should not be more than 2 releases in the same week (but the
70
Release Manager is free to ignore this (get in touch with packagers
73
#. the series are aligned with Ubuntu releases for convenience since we
74
create a new series every 6 months. This means that we support the
75
stable series for 18 months. Note that we also propose the most recent
76
stable series via the ppa, so whether we keep supporting LTS directly
77
or via the ppa is still an open question.
80
At the start of a release cycle
81
===============================
83
32
To start a new release cycle:
85
#. If this is the first release for a given *x.y* then create a new
86
series at <https://launchpad.net/bzr/+addseries>. There is one series
87
for every *x.y* release.
89
#. If you made a new series, create a new pqm-controlled branch for this
90
release series, by asking a Canonical sysadmin. This branch means that
91
from the first release beta or candidate onwards, general development
92
continues on the trunk, and only specifically-targeted fixes go into
95
#. If you made a new series, add milestones at
96
<https://launchpad.net/bzr/x.y/+addmilestone> to that series for
97
the beta release, release candidate and the final release, and their
100
#. Create a new milestone <https://launchpad.net/bzr/x.y/+addmilestone>
101
and add information about this release. We will not use it yet, but it
34
#. Create a new series at <https://launchpad.net/bzr/+addseries>. There is one
35
series for every *x.y* release.
37
#. Go to the series web page at <https://launchpad.net/bzr/x.y>
39
#. Create a new release at
40
<https://launchpad.net/bzr/x.y/+addrelease> and add
41
information about this release. We will not use it yet, but it
102
42
will be available for targeting or nominating bugs.
44
#. We create a new pqm-controlled branch for this release series, by
45
asking a Canonical sysadmin.
46
This branch means that from the first release beta or candidate onwards,
47
general development continues on the trunk, and only
48
specifically-targeted fixes go into the release branch.
50
#. Add milestones at <https://edge.launchpad.net/bzr/x.y/+addmilestone> to
51
that series for the beta release, release candidate and the final release,
52
and their expected dates.
54
#. Update the version number in the ``bzr`` script, and the
55
``bzrlib/__init__.py`` file. Make sure there is always a corresponding
56
milestone when you change that version number.
58
#. Add a new section at the top of ``NEWS`` about the new release,
59
including its version number and the headings from
60
``NEWS-template.txt``.
104
62
#. Send mail to the list with the key dates, who will be the release
105
63
manager, and the main themes or targeted bugs. Ask people to nominate
106
64
objectives, or point out any high-risk things that are best done early,
124
82
submit_to = bazaar@lists.canonical.com
125
83
smtp_server = mail.example.com:25
127
Please see <http://doc.bazaar.canonical.com/developers/HACKING.html#an-overview-of-pqm>
85
Please see <http://doc.bazaar-vcs.org/developers/HACKING.html#an-overview-of-pqm>
128
86
for more details on PQM
130
#. Update the version number in the ``bzr`` script, and the
131
``bzrlib/__init__.py`` file::
133
version_info = (x, y, z, 'dev', 0)
135
#. If you made a new series, then start a new release-notes file::
137
cd doc/en/release-notes
138
cp series-template.txt bzr-x.y.txt # e.g. bzr-2.3.txt
141
#. Add a new section at the top of the current release notes (in
142
``doc/en/release-notes``) about the new release, including its version
143
number and the headings from ``release-template.txt``.
145
#. Update the "What's New" documents in ``doc/en/whats-new``.
147
#. Commit this and send it to PQM.
150
Doing a particular release
151
==========================
153
Update the source code
154
----------------------
156
#. Check that there is a milestone for the release you're doing. If there
157
is no milestone it indicates a process problem - make the milestone but
158
also mail the list to raise this issue in our process. Milestones are
159
found at <https://launchpad.net/bzr/+milestone/x.y.z>.
161
88
#. In the release branch, update ``version_info`` in ``./bzrlib/__init__.py``.
162
89
Make sure the corresponding milestone exists.
163
90
Double check that ./bzr ``_script_version`` matches ``version_info``. Check
166
93
For beta releases use::
168
version_info = (2, 1, 0, 'beta', SERIAL)
172
95
version_info = (2, 1, 0, 'beta', 1)
174
98
For release candidates use::
176
version_info = (2, 0, 1, 'candidate', SERIAL)
178
For stable releases use::
180
version_info = (2, 1, 2, 'final', 0)
182
#. Update the ``./doc/en/release-notes/`` section for this release.
184
Fill out the date and a description of the release under the existing
185
header. If there isn't one, follow the instructions above for using the
186
``release-template.txt`` file.
188
See *2.1.1* or similar for an example of what this looks like.
190
#. Add a summary of the release into the "What's New" document.
192
#. To check that all bugs mentioned in the release notes are actually
193
marked as closed in Launchpad, you can run
194
``tools/check-newsbugs.py``::
196
./tools/check-newsbugs.py doc/en/release-notes/bzr-x.y.txt
198
As of 2011-05-26, only a few false positives remain in the older
199
series. Don't let this slow you down too much. This script accepts
200
options you may find useful, use ``./tools/check-newsbugs.py`` to display
100
version_info = (2, 0, 1, 'candidate', 1)
103
Starting the release phase
104
--------------------------
106
#. Create a new milestone at <https://launchpad.net/bzr/x.y/+addmilestone>
107
for the beta release or release candidate if you haven't already.
109
#. Add the date and release number to ``./NEWS``
111
Depending on whether you're doing a beta or a bugfix release, you'll
112
have to create a NEWS section for your release in the right
113
place. Most of the time, the new section is at the top of the file
114
(look what have been done for the various 2.0x and 2.1.0bx releases).
115
The rule is to keep the sections sorted by date. You'll need to be
116
cautious when merging back to trunk to respect that.
118
#. To check that all bugs mentioned in ``./NEWS`` are actually marked as
119
closed in Launchpad, you can run ``tools/check-newsbugs.py``::
121
./tools/check-newsbugs.py NEWS
123
(But note there can be some false positives, and this script may be
124
flaky <https://bugs.edge.launchpad.net/bzr/+bug/354985>. Don't let
125
this slow you down too much.)
127
#. Summarize into one or two paragraphs what's new in this release.
203
129
#. Commit these changes to the release branch, using a command like::
205
bzr commit -m "Release 2.3.1"
131
bzr commit -m "Release 1.14."
207
133
The diff before you commit will be something like::
209
=== modified file 'bzrlib/__init__.py'
210
--- bzrlib/__init__.py 2011-02-09 06:35:00 +0000
211
+++ bzrlib/__init__.py 2011-03-10 10:24:47 +0000
213
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
214
# releaselevel of 'dev' for unreleased under-development code.
216
-version_info = (2, 3, 1, 'dev', 0)
217
+version_info = (2, 3, 1, 'final', 0)
219
# API compatibility version
220
api_minimum_version = (2, 3, 0)
222
=== modified file 'doc/en/release-notes/bzr-2.3.txt'
223
--- doc/en/release-notes/bzr-2.3.txt 2011-03-09 08:30:16 +0000
224
+++ doc/en/release-notes/bzr-2.3.txt 2011-03-10 10:40:47 +0000
229
-:2.3.1: NOT RELEASED YET
231
-External Compatibility Breaks
232
-*****************************
234
-.. These may require users to change the way they use Bazaar.
239
-.. New commands, options, etc that users may wish to try out.
244
-.. Improvements to existing commands, especially improved performance
245
- or memory usage, or better results.
248
+This is a bugfix release. Upgrading is recommended for all users of earlier
254
=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt'
255
--- doc/en/whats-new/whats-new-in-2.3.txt 2011-02-03 16:29:18 +0000
256
+++ doc/en/whats-new/whats-new-in-2.3.txt 2011-03-10 11:10:36 +0000
258
improvements made to the core product, it highlights enhancements within the
259
broader Bazaar world of potential interest to those upgrading.
261
-Bazaar 2.3.0 is fully compatible both locally and on the network with 2.0 2.1,
262
-and 2.2, and can read and write repositories generated by all previous
263
+Bazaar 2.3.1 includes all the fixes in the un-released 2.0.7, 2.1.4 and 2.2.5
264
+versions that weren't included in 2.3.0 and fixes some bugs on its own.
266
+See the :doc:`../release-notes/index` for details.
268
+Bazaar 2.3 is fully compatible both locally and on the network with 2.0, 2.1,
269
+and 2.2. It can read and write repositories generated by all previous
135
=== modified file 'NEWS'
136
--- NEWS 2008-09-17 23:09:18 +0000
137
+++ NEWS 2008-09-23 16:14:54 +0000
145
+This release includes many bug fixes and a few performance and feature
146
+improvements. ``bzr rm`` will now scan for missing files and remove them,
147
+like how ``bzr add`` scans for unknown files and adds them. A bit more
148
+polish has been applied to the stacking code. The b-tree indexing code has
149
+been brought in, with an eye on using it in a future repository format.
150
+There are only minor installer changes since bzr-1.7rc2.
152
bzr 1.7rc2 2008-09-17
153
---------------------
156
=== modified file 'bzrlib/__init__.py'
157
--- bzrlib/__init__.py 2008-09-16 21:39:28 +0000
158
+++ bzrlib/__init__.py 2008-09-23 16:14:54 +0000
160
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
161
# releaselevel of 'dev' for unreleased under-development code.
163
-version_info = (1, 7, 0, 'candidate', 2)
164
+version_info = (1, 7, 0, 'final', 0)
167
# API compatibility version: bzrlib is currently API compatible with 1.7.
275
169
#. Tag the new release::
279
#. Push those changes to a bzr repository that is public and accessible on
173
#. Push those changes to a bzr reposistory that is public and accessible on
280
174
the Internet. PQM will pull from this repository when it attempts to merge
281
175
your changes. Then submit those changes to PQM for merge into the
282
176
appropriate release branch::
285
bzr pqm-submit -m "(vila) Release 2.3.1 (Vincent Ladeuil)"
289
bzr lp-propose -m "Release 1.14" --approve lp:bzr/1.14
179
bzr pqm-submit -m "(mbp) prepare 1.14"
292
181
#. When PQM succeeds, pull down the master release branch.
302
191
#. Now we'll try expanding this tarball and running the test suite
303
192
to check for packaging problems::
305
make check-dist-tarball | subunit2pyunit
307
You may encounter failures while running the test suite caused by your
308
locally installed plugins. Use your own judgment to decide if you can
309
release with these failures. When in doubt, disable the faulty plugins
310
one by one until you get no more failures. Alternatively, you can use
311
``BZR_DISABLE_PLUGINS`` or ``BZR_PLUGIN_PATH=-site`` to disable one or
314
Remember that PQM has just tested everything too, this step is
315
particularly testing that the pyrex extensions, which are updated
316
by your local pyrex version when you run make dist, are in good
194
make check-dist-tarball
196
You may encounter failures while running the test suite caused
197
by your locally installed plugins. Use your own judgment to
198
decide if you can release with these failures. When in doubt,
199
disable the faulty plugins one by one until you get no more
320
203
Publishing the source tarball
321
204
-----------------------------
323
#. Go to the relevant series page in Launchpad.
206
#. Go to the relevant milestone page in Launchpad.
325
#. Create a release of the milestone, and upload the source tarball and
326
the GPG signature. Or, if you prefer, use the
327
``tools/packaging/lp-upload-release`` script to do this. Note that
328
this changes what the download widget on the Launchpad bzr home
329
page shows, so don't stop the release process yet, or platform binary
330
installers won't be made and the download list will stay very small!
331
<https://bugs.launchpad.net/launchpad/+bug/586445>
208
#. Within that release, upload the source tarball and the GPG
209
signature. Or, if you prefer, use the
210
``tools/packaging/lp-upload-release`` script to do this.
334
213
Announcing the source freeze
335
214
----------------------------
337
#. Post to the ``bazaar`` list, saying that the source has been frozen
338
(gone gold). Be extra clear that this is only a *source* release
339
targeted at packagers and installer builders (see
340
<https://bugs.launchpad.net/launchpad/+bug/645084>). This is the cue
341
for platform maintainers and plugin authors to update their code. This
342
is done before the general public announcement of the release.
345
Kick off the next cycle
346
-----------------------
348
#. To let developers work on the next release, do
349
`At the start of a release cycle` now.
351
#. Pause for a few days.
216
#. Post to the ``bazaar`` list, saying that the source has been frozen.
217
This is the cue for platform maintainers and plugin authors to update
218
their code. This is done before the general public announcement of the
354
222
Publishing the release
422
300
releases. If you do not have a Freshmeat account yet, ask one of the
425
The purpose here is to point users to the latest stable release while still
426
publishing announcements for development releases.
428
There are several kinds of modifications that could be done there via the
429
``Administration`` box in the lower right area of the page:
431
* Edit the project: This is where most of the URLs proposed in the
432
``Links`` box are edited. This should rarely change except for the URLs
433
related to the latest stable release.
435
* New announcement: When doing a release (beta, candidates, final), put the
436
summary of the release (you can't embed URLs there, the moderation staff
437
remove them). Users can still access the releases notes via the ``Release
438
Notes`` URL in the ``Links`` box in the upper right area of the
439
page. When doing the first stable release in a series, delete the
440
``Unstable installers`` <https://launchpad.net/bzr/x.y/x.ybn> and
441
``Unstable source tarball``
442
<http://launchpad.net/bzr/x.y/x.ybn/+download/bzr-x.ybn.tar.gz>
443
links. Conversely, when creating the first beta in a development series,
444
create these links again. Check all links when doing other kinds of
447
* Set direct download: When releasing a new stable release, this should
448
point to the corresponding launchpad page:
449
<https://launchpad.net/bzr/x.y/x.y.z/>
451
303
#. Update `<http://en.wikipedia.org/wiki/Bazaar_(software)>`_ -- this should
452
304
be done for final releases but not for beta releases or Release Candidates.
467
318
Merging the released code back to trunk
468
319
---------------------------------------
470
Merge the release branch back into the trunk. The
471
``doc/en/release-notes`` changes should be merged into the right place
472
because each release series has its own release-notes file, but
475
If it's not already done, advance the version number in ``bzr`` and
476
``bzrlib/__init__.py``. Submit this back into pqm for bzr.dev.
321
Merge the release branch back into the trunk. Check that changes in NEWS
322
were merged into the right sections. If it's not already done, advance
323
the version number in ``bzr`` and ``bzrlib/__init__.py``. Submit this
324
back into pqm for bzr.dev.
478
326
As soon as you change the version number in trunk, make sure you have
479
327
created the corresponding milestone to ensure the continuity in bug
480
328
targeting or nominating. Depending on the change, you may even have to
481
329
create a new series (if your change the major or minor release number), in
482
that case go to `At the start of a release cycle` and follow the instructions from there.
330
that case go to `Starting a cycle` and follow the instructions from there.
484
332
You should also merge (not pull) the release branch into
485
333
``lp:~bzr/bzr/current``, so that branch contains the current released code
493
341
candidate, you're not finished yet. Another beta or candidate or
494
342
hopefully a final release is still to come.
496
The process is the same as for the first release. Goto `Doing a
497
particular release`_ and follow the instructions again. Some details change
344
The process is the same as for the first release. Goto `Starting the
345
release phase`_ and follow the instructions again. Some details change
498
346
between beta, candidate and final releases, but they should be
499
347
documented. If the instructions aren't clear enough, please fix them.
502
Getting the release into Ubuntu
503
-------------------------------
505
(Feel free to propose or add new sections here about what we should do to
506
get bzr into other places.)
508
For the currently-under-development release of Ubuntu, no special action
509
is needed: the release should be picked by Debian and synced from there into
512
Releases off stable bzr branches should go in to the ``-updates`` of the
513
Ubuntu release that originally contained that branch. (Ubuntu Lucid had
514
bzr 2.2.0, so should get every 2.2.x update.) This means going through
515
the `SRU (Stable Release Updates)
516
<https://wiki.ubuntu.com/StableReleaseUpdates>`__ process.
518
As of September 2010, bzr has applied to the technical board to be added
519
to the `MicroReleaseExceptions
520
<https://wiki.ubuntu.com/StableReleaseUpdates/MicroReleaseExceptions>`__
521
category so that whole bugfix releases can more easily be approved.
523
**After making a bzr stable-release release, nominate the most serious bug
524
for the appropriate Ubuntu release and subscribe the `ubuntu-sru` team.**
526
This requires a couple of tricks (please reconsider and tweak as things
527
evolves from one release to the other):
529
* create a distro task with the ``Also affects distribution`` button and
530
select ``bzr (Ubuntu)``.
532
* change the *URL* to point to ``ubuntu/+source/bzr`` instead of ``bzr``
533
(this is needed if you create the distro task but not if it exists
534
already). You should now be able to click the ``Nominate for release``
535
button and select the right Ubuntu release. As of September 2010, this
538
* ``maverick`` for the 2.2 series,
539
* ``lucid`` for the 2.1 series,
540
* ``karmic`` for the 2.0 series.
542
* Subscribe the ``~ubuntu-sru`` team to the bug.
544
* Add a comment targeted to ``~ubuntu-sru`` explaining the expectations
545
(we are targeting running the test suite during the build which, as of
546
September 2010, fails for known reasons that are currently addressed).
547
Search for bugs tagged with ``sru`` for examples and don't forget to tag
548
the bug you selected.
added
removed
doc/developers/releasing.txt
