launchpad-reviewers team mailing list archive

["Francis J. Lacoste" <francis.lacoste@xxxxxxxxxx>]

Francis J. Lacoste has proposed merging lp:~flacoste/maas/setup-bin into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~flacoste/maas/setup-bin/+merge/96257

* Add entry_points to setup.py so that maas and twistd.pserv are installed in the package.
* Increase the version of oops-datedir-repo to match Precise version.
* Allow using system installed buildout instead for bootstrapping.
-- 
https://code.launchpad.net/~flacoste/maas/setup-bin/+merge/96257
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~flacoste/maas/setup-bin into lp:maas.

=== modified file 'Makefile'
--- Makefile	2012-02-15 17:13:37 +0000
+++ Makefile	2012-03-06 22:28:19 +0000
@@ -9,7 +9,11 @@
 all: build doc
 
 bin/buildout: bootstrap.py distribute_setup.py
-	$(PYTHON) bootstrap.py --distribute --setup-source distribute_setup.py
+	@if test -x /usr/bin/buildout2.7; then \
+		/usr/bin/buildout2.7 bootstrap;\
+	else \
+		$(PYTHON) bootstrap.py --distribute --setup-source distribute_setup.py; \
+	fi
 	@touch --no-create $@  # Ensure it's newer than its dependencies.
 
 bin/maas: bin/buildout buildout.cfg setup.py

=== modified file 'setup.py'
--- setup.py	2012-03-01 15:51:37 +0000
+++ setup.py	2012-03-06 22:28:19 +0000
@@ -100,5 +100,11 @@
             'testresources',
             'testtools',
             ],
-    )
+    ),
+    entry_points=dict(
+        console_scripts=[
+            'maas = django.core.management:execute_from_command_line',
+            'twistd.pserv = twisted.scripts.twistd:run',
+        ]
+    ),
 )

=== modified file 'versions.cfg'
--- versions.cfg	2012-03-01 21:55:13 +0000
+++ versions.cfg	2012-03-06 22:28:19 +0000
@@ -19,7 +19,7 @@
 FormEncode = 1.2.4
 oauth = 1.0.1
 oops = 0.0.10
-oops-datedir-repo = 0.0.15
+oops-datedir-repo = 0.0.17
 oops-twisted = 0.0.6
 oops-wsgi = 0.0.9
 PyYAML = 3.10