launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/maas/rename-django into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

=== modified file 'Makefile'
--- Makefile	2012-01-26 12:23:23 +0000
+++ Makefile	2012-01-26 15:03:29 +0000
@@ -1,16 +1,18 @@
 PYTHON = python2.7
 
-build: bin/buildout bin/django bin/test bin/test.ps doc
+build: bin/buildout bin/maas bin/test.maas bin/test.pserv bin/py bin/ipy
+
+all: build doc
 
 bin/buildout: bootstrap.py distribute_setup.py
 	$(PYTHON) bootstrap.py --distribute --setup-source distribute_setup.py
 	@touch --no-create $@  # Ensure it's newer than its dependencies.
 
-bin/django bin/test: bin/buildout buildout.cfg setup.py
-	bin/buildout install django
+bin/maas bin/test.maas: bin/buildout buildout.cfg setup.py
+	bin/buildout install maas
 
-bin/test.ps: bin/buildout buildout.cfg setup.py
-	bin/buildout install test.ps
+bin/test.pserv: bin/buildout buildout.cfg setup.py
+	bin/buildout install pserv-test
 
 bin/flake8: bin/buildout buildout.cfg setup.py
 	bin/buildout install flake8
@@ -18,12 +20,15 @@
 bin/sphinx: bin/buildout buildout.cfg setup.py
 	bin/buildout install sphinx
 
+bin/py bin/ipy: bin/buildout buildout.cfg setup.py
+	bin/buildout install repl
+
 dev-db:
 	utilities/maasdb start ./db/ disposable
 
-test: bin/test bin/test.ps
-	bin/test
-	bin/test.ps
+test: bin/test.maas bin/test.pserv
+	bin/test.maas
+	bin/test.pserv
 
 lint: sources = setup.py src templates utilities
 lint: bin/flake8
@@ -32,11 +37,11 @@
 
 check: clean test
 
-docs/api.rst: bin/django src/maasserver/api.py
-	bin/django gen_rst_api_doc > $@
+docs/api.rst: bin/maas src/maasserver/api.py
+	bin/maas gen_rst_api_doc > $@
 
-sampledata: bin/django
-	bin/django loaddata src/maasserver/fixtures/dev_fixture.yaml
+sampledata: bin/maas
+	bin/maas loaddata src/maasserver/fixtures/dev_fixture.yaml
 
 doc: bin/sphinx docs/api.rst
 	bin/sphinx
@@ -54,14 +59,14 @@
 	$(RM) docs/api.rst
 	$(RM) -r docs/_build/
 
-run: bin/django dev-db
-	bin/django runserver 8000
-
-harness: bin/django dev-db
-	bin/django shell
-
-syncdb: bin/django dev-db
-	bin/django syncdb
+run: bin/maas dev-db
+	bin/maas runserver 8000
+
+harness: bin/maas dev-db
+	bin/maas shell
+
+syncdb: bin/maas dev-db
+	bin/maas syncdb
 
 .PHONY: \
     build check clean dev-db distclean doc \

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-01-26 13:13:02 +0000
+++ buildout.cfg	2012-01-26 15:03:29 +0000
@@ -1,28 +1,41 @@
 [buildout]
 parts =
-  django
   flake8
+  maas
+  pserv
+  pserv-test
+  repl
   sphinx
-  test.ps
 extends = versions.cfg
 versions = versions
-extra-paths =
-  ${buildout:directory}/src
 include-site-packages = false
 # Don't always check for newer packages; use `bin/buildout -n` to
 # override this and check explicitly.
 newest = false
 
-[django]
+[common]
+extra-paths =
+  ${buildout:directory}/src
+
+[testing]
+eggs =
+  coverage
+  fixtures
+  nose
+  nose-subunit
+  python-subunit
+  testresources
+  testtools
+
+[maas]
 recipe = djangorecipe
 settings = development
 eggs =
-  coverage
+  ${testing:eggs}
   django
   django-debug-toolbar
   django-nose
   django-piston
-  fixtures
   oops
   oops-datedir-repo
   oops-twisted
@@ -31,37 +44,47 @@
   rabbitfixture
   setproctitle
   South
+<<<<<<< TREE
   testresources >= 0.2.4-r58
   testtools
   txamqp
+=======
+>>>>>>> MERGE-SOURCE
 project = maas
 projectegg = maas
 test =
   maasserver
   maastesting
-extra-paths = ${buildout:extra-paths}
+testrunner = test.maas
+extra-paths = ${common:extra-paths}
 
-[test.ps]
+[pserv]
 recipe = zc.recipe.egg
 eggs =
   oops-datedir-repo
   oops-twisted
-  python-subunit
-  rabbitfixture
   setproctitle
-  testtools
   twisted
   txamqp
 entry-points =
-  test.ps=subunit.run:SubunitTestProgram
+  pserv=twisted.scripts.twistd:run
+extra-paths = ${common:extra-paths}
+scripts =
+  pserv
+
+[pserv-test]
+recipe = zc.recipe.egg
+eggs =
+  ${testing:eggs}
+  ${pserv:eggs}
+  rabbitfixture
+entry-points =
+  test.pserv=nose.core:TestProgram
 initialization =
-  sys.argv[1:1] = ["discover", "provisioningserver"]
-  from subunit import get_default_formatter
-  from subunit.run import SubunitTestRunner
-  stream = get_default_formatter()
-  runner = SubunitTestRunner(stream)
-arguments = testRunner=runner
-extra-paths = ${buildout:extra-paths}
+  sys.argv[1:1] = ["provisioningserver"]
+extra-paths = ${common:extra-paths}
+scripts =
+  test.pserv
 
 [flake8]
 recipe = zc.recipe.egg
@@ -74,5 +97,13 @@
 recipe = collective.recipe.sphinxbuilder
 source = ${buildout:directory}/docs
 build = ${buildout:directory}/docs/_build
-extra-paths = ${buildout:extra-paths}
-eggs = ${django:eggs}
+extra-paths = ${common:extra-paths}
+eggs = ${maas:eggs} ${pserv:eggs}
+
+# Convenient REPLs with all eggs available.
+[repl]
+recipe = z3c.recipe.scripts
+eggs = ipython ${maas:eggs} ${pserv:eggs}
+extra-paths = ${common:extra-paths}
+interpreter = py
+scripts = ipython=ipy

=== modified file 'versions.cfg'
--- versions.cfg	2012-01-23 16:20:27 +0000
+++ versions.cfg	2012-01-26 15:03:29 +0000
@@ -1,16 +1,26 @@
 [versions]
+coverage =
 django = 1.3.1
 # Bug 251 is problematic in 0.9.2.
 django-debug-toolbar = 0.9.1
+django-nose =
 django-piston =
 fixtures =
+ipython =
+nose =
+nose-subunit =
 oops =
 oops-datedir-repo =
+oops-twisted =
 oops-wsgi =
 # psycopg2 > 2.4.1 is problematic with Django 1.3.1; see
 # https://code.djangoproject.com/ticket/16250
 psycopg2 = 2.4.1
+python-subunit =
 rabbitfixture = 0.3.2
+setproctitle =
 South =
 testresources =
 testtools =
+twisted =
+txamqp =