launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/maas/more-make-jiggery into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~allenap/maas/more-make-jiggery/+merge/89739
-- 
https://code.launchpad.net/~allenap/maas/more-make-jiggery/+merge/89739
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/maas/more-make-jiggery into lp:maas.

=== modified file 'Makefile'
--- Makefile	2012-01-20 15:54:20 +0000
+++ Makefile	2012-01-23 17:02:31 +0000
@@ -5,9 +5,14 @@
 bin/buildout: bootstrap.py distribute_setup.py
 	$(PYTHON) bootstrap.py --distribute --setup-source distribute_setup.py
 
-bin/django bin/django-python bin/sphinx bin/test: \
-    bin/buildout buildout.cfg setup.py
-	bin/buildout
+bin/django bin/test: bin/buildout buildout.cfg setup.py
+	bin/buildout install django
+
+bin/flake8: bin/buildout buildout.cfg setup.py
+	bin/buildout install flake8
+
+bin/sphinx: bin/buildout buildout.cfg setup.py
+	bin/buildout install sphinx
 
 dev-db:
 	utilities/maasdb start ./db/ disposable
@@ -16,7 +21,7 @@
 	bin/test
 
 lint: sources = setup.py src templates utilities
-lint:
+lint: bin/flake8
 	@bin/flake8 $(sources) | \
 	    (! fgrep -v "from maas.settings import *")
 

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-01-23 15:10:16 +0000
+++ buildout.cfg	2012-01-23 17:02:31 +0000
@@ -1,9 +1,9 @@
 [buildout]
 parts =
   django
-  django-python
   flake8
   sphinx
+extends = versions.cfg
 versions = versions
 extra-paths =
   ${buildout:directory}/src
@@ -12,15 +12,6 @@
 # override this and check explicitly.
 newest = false
 
-[versions]
-django = 1.3.1
-# Bug 251 is problematic in 0.9.2.
-django-debug-toolbar = 0.9.1
-# psycopg2 > 2.4.1 is problematic with Django 1.3.1; see
-# https://code.djangoproject.com/ticket/16250
-psycopg2 = 2.4.1
-rabbitfixture = 0.3.2
-
 [django]
 recipe = djangorecipe
 settings = development
@@ -44,12 +35,6 @@
   maastesting
 extra-paths = ${buildout:extra-paths}
 
-[django-python]
-recipe = z3c.recipe.scripts
-eggs = ${django:eggs}
-interpreter = django-python
-scripts =
-
 [flake8]
 recipe = zc.recipe.egg
 eggs =

=== added file 'versions.cfg'
--- versions.cfg	1970-01-01 00:00:00 +0000
+++ versions.cfg	2012-01-23 17:02:31 +0000
@@ -0,0 +1,16 @@
+[versions]
+django = 1.3.1
+# Bug 251 is problematic in 0.9.2.
+django-debug-toolbar = 0.9.1
+django-piston =
+fixtures =
+oops =
+oops-datedir-repo =
+oops-wsgi =
+# psycopg2 > 2.4.1 is problematic with Django 1.3.1; see
+# https://code.djangoproject.com/ticket/16250
+psycopg2 = 2.4.1
+rabbitfixture = 0.3.2
+South =
+testresources =
+testtools =