← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~rvb/maas/dependency-versions into lp:maas

 

Raphaël Badin has proposed merging lp:~rvb/maas/dependency-versions into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/dependency-versions/+merge/103243

This branch:
- s/buildout.cfg/buildout.cfg versions.cfg/ in Makefile to make sure that changes to versions.cfg won't go unnoticed.
- updates versions.cfg (I ran "./bin/buildout buildout:allow-picked-versions=true") to account for the dependencies of the new version of sst.
-- 
https://code.launchpad.net/~rvb/maas/dependency-versions/+merge/103243
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/dependency-versions into lp:maas.
=== modified file 'Makefile'
--- Makefile	2012-04-23 09:54:29 +0000
+++ Makefile	2012-04-24 09:31:29 +0000
@@ -13,35 +13,35 @@
 	$(PYTHON) bootstrap.py --distribute --setup-source distribute_setup.py
 	@touch --no-create $@  # Ensure it's newer than its dependencies.
 
-bin/maas: bin/buildout buildout.cfg setup.py
+bin/maas: bin/buildout buildout.cfg versions.cfg setup.py
 	bin/buildout install maas
 	@touch --no-create $@
 
-bin/test.maas: bin/buildout buildout.cfg setup.py
+bin/test.maas: bin/buildout buildout.cfg versions.cfg setup.py
 	bin/buildout install maas-test
 	@touch --no-create $@
 
-bin/twistd.pserv: bin/buildout buildout.cfg setup.py
+bin/twistd.pserv: bin/buildout buildout.cfg versions.cfg setup.py
 	bin/buildout install pserv
 	@touch --no-create $@
 
-bin/test.pserv: bin/buildout buildout.cfg setup.py
+bin/test.pserv: bin/buildout buildout.cfg versions.cfg setup.py
 	bin/buildout install pserv-test
 	@touch --no-create $@
 
-bin/twistd.txlongpoll: bin/buildout buildout.cfg setup.py
+bin/twistd.txlongpoll: bin/buildout buildout.cfg versions.cfg setup.py
 	bin/buildout install txlongpoll
 	@touch --no-create $@
 
-bin/flake8: bin/buildout buildout.cfg setup.py
+bin/flake8: bin/buildout buildout.cfg versions.cfg setup.py
 	bin/buildout install flake8
 	@touch --no-create $@
 
-bin/sphinx: bin/buildout buildout.cfg setup.py
+bin/sphinx: bin/buildout buildout.cfg versions.cfg setup.py
 	bin/buildout install sphinx
 	@touch --no-create $@
 
-bin/py bin/ipy: bin/buildout buildout.cfg setup.py
+bin/py bin/ipy: bin/buildout buildout.cfg versions.cfg setup.py
 	bin/buildout install repl
 	@touch --no-create bin/py bin/ipy
 

=== modified file 'versions.cfg'
--- versions.cfg	2012-04-23 15:33:25 +0000
+++ versions.cfg	2012-04-24 09:31:29 +0000
@@ -95,22 +95,10 @@
 entrypoint2 = 0.0.4
 
 # Required by:
-# sst==0.1.0
-junitxml = 0.6
-
-# Required by:
 # PyVirtualDisplay==0.0.9
 path.py = 2.2.2
 
 # Required by:
-# sst==0.1.0
-selenium = 2.19.1
-
-# Required by:
-# sst==0.1.0
-unittest2 = 0.5.1
-
-# Required by:
 # oops==0.0.10
 iso8601 = 0.1.4
 
@@ -166,3 +154,17 @@
 # Twisted==11.1.0
 # lazr.authentication==0.1.2
 zope.interface = 3.6.1
+
+# Added by Buildout Versions at 2012-04-24 11:28:06.120704
+
+# Required by:
+# sst==0.2.1
+junitxml = 0.6
+
+# Required by:
+# sst==0.2.1
+selenium = 2.21.2
+
+# Required by:
+# sst==0.2.1
+unittest2 = 0.5.1