Launchpad itself

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

  1. build-testtools
  2. Merge into devel
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Graham Binns
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~mwhudson/launchpad/build-testtools
Merge into: lp:launchpad
Diff against target: 31 lines (+3/-1)
2 files modified
setup.py (+2/-1)
versions.cfg (+1/-0)
To merge this branch: bzr merge lp:~mwhudson/launchpad/build-testtools
Reviewer Review Type Date Requested Status
Graham Binns (community) code Approve
Review via email: mp+16829@code.launchpad.net

Commit message

build testtools

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

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

Revision history for this message
Robert Collins (lifeless) wrote :

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

-Rob

Revision history for this message
Jonathan Lange (jml) wrote :

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

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

Revision history for this message
Graham Binns (gmb) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2009-12-08 11:44:14 +0000
3+++ setup.py 2010-01-05 04:01:15 +0000
4@@ -1,6 +1,6 @@
5 #!/usr/bin/env python
6 #
7-# Copyright 2009 Canonical Ltd. This software is licensed under the
8+# Copyright 2009, 2010 Canonical Ltd. This software is licensed under the
9 # GNU Affero General Public License version 3 (see the file LICENSE).
10
11 import ez_setup
12@@ -54,6 +54,7 @@
13 'setuptools',
14 'sourcecodegen',
15 'storm',
16+ 'testtools',
17 'transaction',
18 'Twisted',
19 'wadllib',
20
21=== modified file 'versions.cfg'
22--- versions.cfg 2010-01-04 16:02:31 +0000
23+++ versions.cfg 2010-01-05 04:01:15 +0000
24@@ -55,6 +55,7 @@
25 # This is Storm 0.15 with r342 cherry-picked which fixes a memory leak
26 # important for message sharing migration script.
27 storm = 0.15danilo-storm-launchpad-r342
28+testtools = 0.9.2
29 transaction = 1.0.0
30 Twisted = 9.0.0
31 uuid = 1.30