Merge lp:~mwhudson/launchpad/build-testtools into lp:launchpad

[Michael Hudson-Doyle]

build testtools

[Michael Hudson-Doyle (mwhudson)]

bzr.dev depends on testtools now, so we should build it.

[Robert Collins (lifeless)]

testtools isn't a very fast target; it would be safe to use packages
IMNSHO. The losas have it already.

-Rob

[Jonathan Lange (jml)]

I think it's moving fast enough for us to prefer eggs.

On the MP more generally, c.f. lp:~jml/launchpad/use-testtools.

[Graham Binns (gmb)]

This all looks sane to me. I'll leave it to people who have worn the build engineer hat to decide how and when it should land.

review: Approve (code)

=== modified file 'setup.py'
--- setup.py	2009-12-08 11:44:14 +0000
+++ setup.py	2010-01-05 04:01:15 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009, 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 import ez_setup
@@ -54,6 +54,7 @@
         'setuptools',
         'sourcecodegen',
         'storm',
+        'testtools',
         'transaction',
         'Twisted', 
         'wadllib',
 
=== modified file 'versions.cfg'
--- versions.cfg	2010-01-04 16:02:31 +0000
+++ versions.cfg	2010-01-05 04:01:15 +0000
@@ -55,6 +55,7 @@
 # This is Storm 0.15 with r342 cherry-picked which fixes a memory leak
 # important for message sharing migration script.
 storm = 0.15danilo-storm-launchpad-r342
+testtools = 0.9.2
 transaction = 1.0.0
 Twisted = 9.0.0
 uuid = 1.30