maas-devel team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/maas/just-add-bunnies into lp:maas.

Requested reviews:
  MaaS Developers (maas-devel)

For more details, see:
https://code.launchpad.net/~allenap/maas/just-add-bunnies/+merge/88869

This adds rabbitfixture as a dependency. It also cleans up the deps in Makefile and adds a django-python section to buildout.cfg which will create a "plain" Python interpreter with the same sys.path as the django environment.
-- 
https://code.launchpad.net/~allenap/maas/just-add-bunnies/+merge/88869
Your team MaaS Developers is requested to review the proposed merge of lp:~allenap/maas/just-add-bunnies into lp:maas.

=== modified file '.bzrignore'
--- .bzrignore	2012-01-16 17:02:49 +0000
+++ .bzrignore	2012-01-17 14:55:41 +0000
@@ -1,5 +1,6 @@
 bin/buildout
 bin/django
+bin/django-python
 bin/test
 build
 db

=== modified file 'Makefile'
--- Makefile	2012-01-17 09:23:30 +0000
+++ Makefile	2012-01-17 14:55:41 +0000
@@ -1,45 +1,44 @@
-PYTHON_SRC := $(shell find src -name '*.py' )
-PYTHON = python
-
-build: bin/buildout
-
-bin/buildout: buildout.cfg setup.py
+PYTHON = python2.7
+
+build: bin/buildout bin/django
+
+bin/buildout: bootstrap.py
 	$(PYTHON) bootstrap.py
+
+bin/django bin/django-python bin/test: bin/buildout buildout.cfg setup.py
 	bin/buildout
-	@touch bin/buildout
 
 dev-db:
 	bin/maasdb start ./db/ disposable
 
-test: dev-db
+test: bin/test dev-db
 	bin/test
 
 lint:
-	pyflakes $(PYTHON_SRC)
-	pylint --rcfile=etc/pylintrc $(PYTHON_SRC)
+	pyflakes .
 
-check: clean bin/buildout dev-db
-	bin/test
+check: clean test
 
 clean:
-	find . -type f -name '*.py[co]' -exec rm -f {} \;
-	rm -f bin/buildout
-	#bzr clean-tree --unknown --force
+	find . -type f -name '*.py[co]' -print0 | xargs -r0 $(RM)
+	$(RM) bin/buildout bin/django bin/django-python bin/test
 
 distclean: clean
 	bin/maasdb delete-cluster ./db/
-	rm -rf download-cache
-	rm -rf eggs
-	rm -rf develop-eggs
-
-tags:
-	bin/tags
-
-run: build dev-db
+	$(RM) -r eggs develop-eggs
+	$(RM) -r build logs parts
+	$(RM) tags TAGS .installed.cfg
+	$(RM) *.egg *.egg-info
+
+run: bin/django dev-db
 	bin/django runserver 8000
 
-harness: build dev-db
+harness: bin/django dev-db
 	bin/django shell
 
-syncdb: build dev-db
+syncdb: bin/django dev-db
 	bin/django syncdb
+
+.PHONY: \
+	build check clean dev-db distclean harness lint run syncdb
+	test

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-01-17 11:24:00 +0000
+++ buildout.cfg	2012-01-17 14:55:41 +0000
@@ -1,9 +1,7 @@
 [buildout]
-parts = django
-eggs =
-  django-piston
-  South
-  django-debug-toolbar
+parts =
+  django
+  django-python
 versions = versions
 extra-paths =
   ${buildout:directory}/src/
@@ -14,12 +12,24 @@
 django = 1.3.1
 # Bug 251 is problematic in 0.9.2.
 django-debug-toolbar = 0.9.1
+rabbitfixture = 0.3.2
 
 [django]
 recipe = djangorecipe
 settings = development
-eggs = ${buildout:eggs}
+eggs =
+  django
+  django-piston
+  South
+  django-debug-toolbar
+  rabbitfixture
 project = maas
 projectegg = maas
 test = maasserver
 extra-paths = ${buildout:extra-paths}
+
+[django-python]
+recipe = z3c.recipe.scripts
+eggs = ${django:eggs}
+interpreter = django-python
+scripts =