Rev 5644: 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: 5644
revision-id: v.ladeuil+lp at free.fr-20110513094538-8cdm92lasa7de7cq
parent: v.ladeuil+lp at free.fr-20110512202605-whwfrkgddrxv1exm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.3.2-dev
timestamp: Fri 2011-05-13 11:45:38 +0200
message:
  Release 2.3.3
-------------- next part --------------
=== modified file 'bzr'
--- a/bzr	2011-03-10 13:06:14 +0000
+++ b/bzr	2011-05-13 09:45:38 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 3, 2)
+_script_version = (2, 3, 3)
 
 try:
     version_info = sys.version_info

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2011-05-12 17:05:52 +0000
+++ b/bzrlib/__init__.py	2011-05-13 09:45:38 +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, 2, 'final', 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 09:45:38 +0000
@@ -5,6 +5,25 @@
 .. toctree::
    :maxdepth: 1
 
+bzr 2.3.3
+#########
+
+:2.3.2: 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
 *****************************