Rev 5648: Release 2.3.3 in http://bazaar.launchpad.net/~vila/bzr/2.3-integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/2.3-integration/

------------------------------------------------------------
revno: 5648
revision-id: v.ladeuil+lp at free.fr-20110513125129-dnztgrp4df8ufsue
parent: v.ladeuil+lp at free.fr-20110513122607-4hwo8kup7ec2ebsm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.3.3-dev
timestamp: Fri 2011-05-13 14:51:29 +0200
message:
  Release 2.3.3
-------------- next part --------------
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2011-05-13 10:57:56 +0000
+++ b/bzrlib/__init__.py	2011-05-13 12:51:29 +0000
@@ -52,7 +52,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 = (2, 3, 3, 'dev', 0)
+version_info = (2, 3, 3, 'final', 0)
 
 # API compatibility version
 api_minimum_version = (2, 3, 0)

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2011-05-12 17:05:52 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2011-05-13 12:51:29 +0000
@@ -5,6 +5,25 @@
 .. toctree::
    :maxdepth: 1
 
+bzr 2.3.3
+#########
+
+:2.3.3: 2011-05-13
+
+This is a bugfix release. Upgrading is recommended for all users of earlier
+2.3 releases.
+
+This fixed a bug in the test suite triggered by python-2.7 deprecating some
+tests helpers.
+
+Testing
+*******
+
+* Stop using `failIf`, `failUnless`, `failIfEqual`, etc, that give
+  `PendingDeprecationWarnings` on Python2.7. 
+  (Martin Pool, #760435)
+
+
 bzr 2.3.2
 #########
 
@@ -13,6 +32,9 @@
 This is a bugfix release. Upgrading is recommended for all users of earlier
 2.3 releases.
 
+This was never released due to bug #760435 interrupting the release process by
+breaking the test suite under python-2.7 on natty.
+
 External Compatibility Breaks
 *****************************
 
@@ -42,10 +64,6 @@
   normally not require running ``bzr whoami`` first.
   (Martin Pool, #616878)
 
-* When reporting a crash without apport, don't print the full list of
-   plugins because it's often too long.
-   (Martin Pool, #716389)
-
 * ``bzr merge --preview --pull`` should respect the ``--preview`` option
   first, and not actually change the branch tip revision.
   (John Arbash Meinel, Dennis Duchier, #760152)
@@ -68,6 +86,10 @@
   this might be required for "installing" extra dependencies for some plugins.
   (Alexander Belchenko, #743256)
 
+* When reporting a crash without apport, don't print the full list of
+   plugins because it's often too long.
+   (Martin Pool, #716389)
+
 API Changes
 ***********
 

=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt'
--- a/doc/en/whats-new/whats-new-in-2.3.txt	2011-05-12 17:05:52 +0000
+++ b/doc/en/whats-new/whats-new-in-2.3.txt	2011-05-13 12:51:29 +0000
@@ -20,7 +20,10 @@
 Bazaar 2.3.1 includes all the fixes in the un-released 2.0.7, 2.1.4 and 2.2.5
 versions that weren't included in 2.3.0 and fixes some bugs on its own.
 
-Bazaar 2.3.2 is a bugfix release.
+Bazaar 2.3.2 is a bugfix release that was never released.
+
+Bazaar 2.3.3 is a bugfix release including the fixes in 2.3.2 and
+fixing the test helpers deprecated by python-2.7.
 
 See the :doc:`../release-notes/index` for details.