~bzr-pqm/bzr/bzr.dev

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
Releasing Bazaar
################

This document describes the processes for making and announcing a Bazaar
release, and managing the release process.  This is just one phase of the
`overall development cycle <http://doc.bazaar.canonical.com/developers/cycle.html>`_,
but it's the most complex part.  This document gives a checklist you can
follow from start to end in one go.

If you're helping the Release Manager (RM) for one reason or another, you
may notice that he didn't follow that document scrupulously. He may have
good reasons to do that but he may also have missed some parts.

Follow the document yourself and don't hesitate to create the missing
milestones for example (we tend to forget these ones a lot).

.. contents::


Preconditions
=============

#. Download the pqm plugin and install it into your ``~/.bazaar/plugins``::

     bzr branch lp:bzr-pqm ~/.bazaar/plugins/pqm


At the start of a release cycle
===============================

To start a new release cycle:

#. If this is the first release for a given *x.y* then create a new
   series at <https://launchpad.net/bzr/+addseries>. There is one series
   for every *x.y* release.

#. If you made a new series, create a new pqm-controlled branch for this
   release series, by asking a Canonical sysadmin.  This branch means that
   from the first release beta or candidate onwards, general development
   continues on the trunk, and only specifically-targeted fixes go into
   the release branch.

#. If you made a new series, add milestones at
   <https://edge.launchpad.net/bzr/x.y/+addmilestone> to that series for
   the beta release, release candidate and the final release, and their
   expected dates.

#. Create a new milestone <https://edge.launchpad.net/bzr/x.y/+addmilestone>
   and add information about this release.  We will not use it yet, but it
   will be available for targeting or nominating bugs.

#. Send mail to the list with the key dates, who will be the release
   manager, and the main themes or targeted bugs.  Ask people to nominate
   objectives, or point out any high-risk things that are best done early,
   or that interact with other changes. This is called the metronome mail
   and is described in `Development cycles <cycle.html>`_.

#. Make a local branch for preparing this release.  (Only for the first
   release in a series, otherwise you should already have a branch.) ::

     bzr branch trunk prepare-1.14

#. Configure pqm-submit for this branch, with a section like this (where
   x.y is the version to release). **Or use hydrazine for easy use**
   ``~/.bazaar/locations.conf``::

	[/home/mbp/bzr/prepare-x.y]
	pqm_email = Canonical PQM <pqm@bazaar-vcs.org>
	submit_branch = http://bazaar.launchpad.net/~bzr-pqm/bzr/x.y
	parent_branch = http://bazaar.launchpad.net/~bzr-pqm/bzr/x.y
	public_branch = http://bazaar.example.com/prepare-x.y
	submit_to = bazaar@lists.canonical.com
	smtp_server = mail.example.com:25

    Please see <http://doc.bazaar.canonical.com/developers/HACKING.html#an-overview-of-pqm>
    for more details on PQM

#. Update the version number in the ``bzr`` script, and the
   ``bzrlib/__init__.py`` file::
   
       version_info = (x, y, z, 'dev', 0)
   
#. Add a new section at the top of ``NEWS`` about the new release,
   including its version number and the headings from
   ``NEWS-template.txt``.

#. Update the "What's New" documents in ``doc/en/whats-new``.

#. Commit this and send it to PQM.


Doing a particular release
==========================

Update the source code
----------------------

#. Check that there is a milestone for the release you're doing. If there
   is no milestone it indicates a process problem - make the milestone but
   also mail the list to raise this issue in our process. Milestones are
   found at <https://launchpad.net/bzr/+milestone/x.y.z>.

#. In the release branch, update  ``version_info`` in ``./bzrlib/__init__.py``.
   Make sure the corresponding milestone exists.
   Double check that ./bzr ``_script_version`` matches ``version_info``. Check
   the output of ``bzr --version``.

   For beta releases use::

       version_info = (2, 1, 0, 'beta', SERIAL)

   For instance 2.1b1::

       version_info = (2, 1, 0, 'beta', 1)

   For release candidates use::

       version_info = (2, 0, 1, 'candidate', SERIAL)

   For stable releases use::

       version_info = (2, 1, 2, 'final', 0)

#. Update the ``./NEWS`` section for this release.

   Fill out the date and a description of the release under the existing
   header. If there isn't one, follow the above for using the NEWS
   template.

   See *2.1.1* or similar for an example of what this looks like.

#. Add a summary of the release into the "What's New" document.

#. To check that all bugs mentioned in ``./NEWS`` are actually marked as
   closed in Launchpad, you can run ``tools/check-newsbugs.py``::

     ./tools/check-newsbugs.py NEWS

   (But note there will be many false positives, and this script may be
   flaky <https://bugs.edge.launchpad.net/bzr/+bug/354985>.  Don't let
   this slow you down too much.)

#. Commit these changes to the release branch, using a command like::

     bzr commit -m "Release 1.14."

   The diff before you commit will be something like::

     === modified file 'NEWS'
     --- NEWS        2008-09-17 23:09:18 +0000
     +++ NEWS        2008-09-23 16:14:54 +0000
     @@ -4,6 +4,23 @@

      .. contents::

     +bzr 1.7 2008-09-23
     +------------------
     +
     +This release includes many bug fixes and a few performance and feature
     +improvements.  ``bzr rm`` will now scan for missing files and remove them,
     +like how ``bzr add`` scans for unknown files and adds them. A bit more
     +polish has been applied to the stacking code. The b-tree indexing code has
     +been brought in, with an eye on using it in a future repository format.
     +There are only minor installer changes since bzr-1.7rc2.
     +
      bzr 1.7rc2 2008-09-17
      ---------------------


     === modified file 'bzrlib/__init__.py'
     --- bzrlib/__init__.py  2008-09-16 21:39:28 +0000
     +++ bzrlib/__init__.py  2008-09-23 16:14:54 +0000
     @@ -41,7 +41,7 @@
      # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
      # releaselevel of 'dev' for unreleased under-development code.

     -version_info = (1, 7, 0, 'candidate', 2)
     +version_info = (1, 7, 0, 'final', 0)


      # API compatibility version: bzrlib is currently API compatible with 1.7.

#. Tag the new release::

     bzr tag bzr-1.14

#. Push those changes to a bzr repository that is public and accessible on
   the Internet. PQM will pull from this repository when it attempts to merge
   your changes. Then submit those changes to PQM for merge into the
   appropriate release branch::

     bzr push
     bzr pqm-submit -m "(mbp) prepare 1.14"

   Or with hydrazine::

     bzr lp-propose -m "Release 1.14" --approve lp:bzr/1.14
     feed-pqm bzr

#. When PQM succeeds, pull down the master release branch.


Making the source tarball
-------------------------

#. Change into the source directory and run ::

     make dist

#. Now we'll try expanding this tarball and running the test suite
   to check for packaging problems::

     make check-dist-tarball

   You may encounter failures while running the test suite caused
   by your locally installed plugins. Use your own judgment to
   decide if you can release with these failures. When in doubt,
   disable the faulty plugins one by one until you get no more
   failures.

   Remember that PQM has just tested everything too, this step is
   particularly testing that the pyrex extensions, which are updated
   by your local pyrex version when you run make dist, are in good
   shape.


Publishing the source tarball
-----------------------------

#. Go to the relevant milestone page in Launchpad.

#. Create a release of the milestone, and upload the source tarball and
   the GPG signature.  Or, if you prefer, use the
   ``tools/packaging/lp-upload-release`` script to do this. Note that
   this changes what the download widget on the Launchpad bzr home
   page shows, so don't stop the release process yet, or platform binary
   installers won't be made and the download list will stay very small!
   <https://bugs.edge.launchpad.net/launchpad/+bug/586445>


Announcing the source freeze
----------------------------

#. Post to the ``bazaar`` list, saying that the source has been frozen.
   This is the cue for platform maintainers and plugin authors to update
   their code.  This is done before the general public announcement of the
   release.


Kick off the next cycle
-----------------------

#. To let developers work on the next release, do
   `At the start of a release cycle` now.

#. Pause for a few days.


Publishing the release
----------------------

There is normally a delay of a few days after the source freeze to allow
for binaries to be built on various platforms.  Once they have been built,
we have a releasable product.  The next step is to make it generally
available to the world.

#. Go to the release web page at <https://launchpad.net/bzr/x.y/x.y.z>

#. Announce on the `Bazaar website <http://bazaar.canonical.com/>`_.
   This page is edited via the lp:bzr-website branch. (Changes
   pushed to this branch are refreshed by a cron job on escudero.)

#. Check that the documentation for this release is available in
   <http://doc.bazaar.canonical.com>.  It should be automatically build when the
   branch is created, by a cron script ``update-bzr-docs`` on
   ``escudero``. As of today (2009-08-27) ``igc`` manually updates the
   pretty version of it.


Announcing the release
----------------------

Now that the release is publicly available, tell people about it.

#. Make an announcement mail.

   For release candidates or beta releases, this is sent to the ``bazaar``
   list only to inform plugin authors and package or installer managers.

   Once the installers are available, the mail can be sent to the
   ``bazaar-announce`` list too.

   For final releases, it should also be cc'd to ``info-gnu@gnu.org``,
   ``python-announce-list@python.org``, ``bug-directory@gnu.org``.

   In all cases, it is good to set ``Reply-To: bazaar@lists.canonical.com``,
   so that people who reply to the announcement don't spam other lists.

   The announce mail will look something like this::

      Subject: bzr x.y.z released!

      <<Summary paragraph from news>>

      The Bazaar team is happy to announce availability of a new
      release of the bzr adaptive version control system.
      Bazaar is part of the GNU system <http://gnu.org/>.

      Thanks to everyone who contributed patches, suggestions, and
      feedback.

      Bazaar is now available for download from
      https://launchpad.net/bzr/2.x/2.x/ as a source tarball; packages
      for various systems will be available soon.

      <<NEWS section from this release back to the last major release>>

   Feel free to tweak this to your taste.

#. Make an announcement through <https://launchpad.net/bzr/+announce>

#. Update the IRC channel topic. Use the ``/topic`` command to do this,
   ensuring the new topic text keeps the project name, web site link, etc.

#. Announce on http://freshmeat.net/projects/bzr/

   This should be done for beta releases, release candidates and final
   releases. If you do not have a Freshmeat account yet, ask one of the
   existing admins.

#. Update `<http://en.wikipedia.org/wiki/Bazaar_(software)>`_ -- this should
   be done for final releases but not for beta releases or Release Candidates.

#. Update the python package index: <http://pypi.python.org/pypi/bzr> - best
   done by running ::

       python setup.py register

   Remember to check the results afterwards.

   To be able to register the release you must create an account on
   <http://pypi.python.org/pypi> and have one of the existing owners of
   the project add you to the group.


Merging the released code back to trunk
---------------------------------------

The rule is to keep ``NEWS`` sections sorted by date. You'll need to
review the merge and make sure that that is respected.

Merge the release branch back into the trunk.  Check that changes in NEWS
were merged into the right sections.  If it's not already done, advance
the version number in ``bzr`` and ``bzrlib/__init__.py``.  Submit this
back into pqm for bzr.dev.

As soon as you change the version number in trunk, make sure you have
created the corresponding milestone to ensure the continuity in bug
targeting or nominating. Depending on the change, you may even have to
create a new series (if your change the major or minor release number), in
that case go to `At the start of a release cycle` and follow the instructions from there.

You should also merge (not pull) the release branch into
``lp:~bzr/bzr/current``, so that branch contains the current released code
at any time.

Releases until the final one
----------------------------

Congratulations - you have made your first release.  Have a beer
or fruit juice - it's on the house! If it was a beta, or
candidate, you're not finished yet. Another beta or candidate or
hopefully a final release is still to come.

The process is the same as for the first release. Goto `Doing a
particular release`_ and follow the instructions again. Some details change
between beta, candidate and final releases, but they should be
documented. If the instructions aren't clear enough, please fix them.


Getting the release into Ubuntu
-------------------------------

(Feel free to propose or add new sections here about what we should do to
get bzr into other places.)

For the currently-under-development release of Ubuntu, no special action
is needed: the release should be picked by Debian and synced from there into
Ubuntu.

Releases off stable bzr branches should go in to the ``-updates`` of the
Ubuntu release that originally contained that branch.  (Ubuntu Lucid had
bzr 2.2.0, so should get every 2.2.x update.)  This means going through
the `SRU (Stable Release Updates)
<https://wiki.ubuntu.com/StableReleaseUpdates>`__ process.   

As of September 2010, bzr has applied to the technical board to be added
to the `MicroReleaseExceptions
<https://wiki.ubuntu.com/StableReleaseUpdates/MicroReleaseExceptions>`__
category so that whole bugfix releases can more easily be approved.

**After making a bzr stable-release release, nominate the most serious bug
for the appropriate Ubuntu release and subscribe the `ubuntu-sru` team.**

This requires a couple of tricks (please reconsider and tweak as things
evolves from one release to the other):

 * create a distro task with the ``Also affects distribution`` button and
   select ``bzr (Ubuntu)``.

 * change the *URL* to point to ``ubuntu/+source/bzr`` instead of ``bzr``
   (this is needed if you create the distro task but not if it exists
   already). You should now be able to click the ``Nominate for release``
   button and select the right Ubuntu release. As of September 2010, this
   means:

  * ``maverick`` for the 2.2 series,
  * ``lucid`` for the 2.1 series,
  * ``karmic`` for the 2.0 series.

 * Subscribe the ``~ubuntu-sru`` team to the bug.

 * Add a comment targeted to ``~ubuntu-sru`` explaining the expectations
   (we are targeting running the test suite during the build which, as of
   September 2010, fails for known reasons that are currently addressed).
   Search for bugs tagged with ``sru`` for examples and don't forget to tag
   the bug you selected.


See also
--------

* `Packaging into the bzr PPA <ppa.html>`_ to make and publish Ubuntu
  packages.
* `Bazaar Developer Document Catalog <index.html>`_
* `Development cycles <cycle.html>`_: things that happen during the cycle
  before the actual release.

..
   vim: filetype=rst textwidth=74 ai shiftwidth=4