launchpad-reviewers team mailing list archive

[Gary Poster <gary.poster@xxxxxxxxxxxxx>]

Gary Poster has proposed merging lp:~gary/launchpad/buildout into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #627159 codebrowse is taking around 10 minutes to startup
  https://bugs.launchpad.net/bugs/627159


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.
-- 
https://code.launchpad.net/~gary/launchpad/buildout/+merge/34251
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~gary/launchpad/buildout into lp:launchpad/devel.

=== modified file 'Makefile'
--- Makefile	2010-08-09 11:19:55 +0000
+++ Makefile	2010-08-31 21:29:44 +0000
@@ -179,10 +179,13 @@
 # The download-cache dependency comes *before* eggs so that developers get the
 # warning before the eggs directory is made.  The target for the eggs directory
 # is only there for deployment convenience.
+# Note that the buildout version must be maintained here and in versions.cfg
+# to make sure that the build does not go over the network.
 bin/buildout: download-cache eggs
 	$(SHHH) PYTHONPATH= $(PYTHON) bootstrap.py\
 		--setup-source=ez_setup.py \
-		--download-base=download-cache/dist --eggs=eggs
+		--download-base=download-cache/dist --eggs=eggs \
+		--version=1.5.1
 
 # This target is used by LOSAs to prepare a build to be pushed out to
 # destination machines.  We only want eggs: they are the expensive bits,

=== modified file 'versions.cfg'
--- versions.cfg	2010-08-25 14:42:52 +0000
+++ versions.cfg	2010-08-31 21:29:44 +0000
@@ -100,8 +100,8 @@
 z3c.ptcompat = 0.5.3
 z3c.recipe.filetemplate = 2.1.0
 z3c.recipe.i18n = 0.5.3
-z3c.recipe.scripts = 1.0.0
-z3c.recipe.tag = 0.2.0
+z3c.recipe.scripts = 1.0.1
+z3c.recipe.tag = 0.4.0
 z3c.rml = 0.7.3
 z3c.skin.pagelet = 1.0.2
 z3c.template = 1.1.0
@@ -110,12 +110,13 @@
 z3c.viewlet = 1.0.0
 z3c.viewtemplate = 0.3.2
 z3c.zrtresource = 1.0.1
-zc.buildout = 1.5.0
+# Also upgrade the zc.buildout version in the Makefile's bin/buildout section.
+zc.buildout = 1.5.1
 zc.catalog = 1.2.0
 zc.datetimewidget = 0.5.2
 zc.i18n = 0.5.2
 zc.lockfile = 1.0.0
-zc.recipe.egg = 1.3.0
+zc.recipe.egg = 1.3.2
 zc.zservertracelog = 1.1.5
 ZConfig = 2.7.1
 zdaemon = 2.0.4