Launchpad itself

Merge lp:~gary/launchpad/buildout into lp:launchpad

  1. buildout
  2. Merge into devel
Proposed by Gary Poster
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: no longer in the source branch.
Merged at revision: 11480
Proposed branch: lp:~gary/launchpad/buildout
Merge into: lp:launchpad
Diff against target: 49 lines (+9/-5)
2 files modified
Makefile (+4/-1)
versions.cfg (+5/-4)
To merge this branch: bzr merge lp:~gary/launchpad/buildout
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Review via email: mp+34251@code.launchpad.net

Commit message

Fix bug 627159, and upgrade some dependencies while we're at it.

Description of the change

bug 627159 was caused by --version being removed from the Makefile's call to bootstrap. This means that bootstrap doesn't know what version to use, and tries to go over the wire to figure out what to do.

This branch reinstates the --version argument. It adds comments in both places that the buildout version is specified.

I doublechecked that this solved the problem by disconnecting my machine from the network while I ran make. AOK.

It also updates some related dependencies while I was at it.

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

Looks good. I wonder if there's something in ec2 test we can do to make the build if we break this again.......

review: Approve
Revision history for this message
Gary Poster (gary) wrote :

Thank you for the review.

If we do https://dev.launchpad.net/Foundations/Proposals/SimplifyMergeMachinery then the LOSAs can just control the PQM/tarmac machines as they would control the production machines.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2010-08-09 11:19:55 +0000
3+++ Makefile 2010-08-31 21:29:44 +0000
4@@ -179,10 +179,13 @@
5 # The download-cache dependency comes *before* eggs so that developers get the
6 # warning before the eggs directory is made. The target for the eggs directory
7 # is only there for deployment convenience.
8+# Note that the buildout version must be maintained here and in versions.cfg
9+# to make sure that the build does not go over the network.
10 bin/buildout: download-cache eggs
11 $(SHHH) PYTHONPATH= $(PYTHON) bootstrap.py\
12 --setup-source=ez_setup.py \
13- --download-base=download-cache/dist --eggs=eggs
14+ --download-base=download-cache/dist --eggs=eggs \
15+ --version=1.5.1
16
17 # This target is used by LOSAs to prepare a build to be pushed out to
18 # destination machines. We only want eggs: they are the expensive bits,
19
20=== modified file 'versions.cfg'
21--- versions.cfg 2010-08-25 14:42:52 +0000
22+++ versions.cfg 2010-08-31 21:29:44 +0000
23@@ -100,8 +100,8 @@
24 z3c.ptcompat = 0.5.3
25 z3c.recipe.filetemplate = 2.1.0
26 z3c.recipe.i18n = 0.5.3
27-z3c.recipe.scripts = 1.0.0
28-z3c.recipe.tag = 0.2.0
29+z3c.recipe.scripts = 1.0.1
30+z3c.recipe.tag = 0.4.0
31 z3c.rml = 0.7.3
32 z3c.skin.pagelet = 1.0.2
33 z3c.template = 1.1.0
34@@ -110,12 +110,13 @@
35 z3c.viewlet = 1.0.0
36 z3c.viewtemplate = 0.3.2
37 z3c.zrtresource = 1.0.1
38-zc.buildout = 1.5.0
39+# Also upgrade the zc.buildout version in the Makefile's bin/buildout section.
40+zc.buildout = 1.5.1
41 zc.catalog = 1.2.0
42 zc.datetimewidget = 0.5.2
43 zc.i18n = 0.5.2
44 zc.lockfile = 1.0.0
45-zc.recipe.egg = 1.3.0
46+zc.recipe.egg = 1.3.2
47 zc.zservertracelog = 1.1.5
48 ZConfig = 2.7.1
49 zdaemon = 2.0.4