launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/maas/prod-deps-not-in-buildout-precise into lp:maas/12.04-nocobbler.

Commit message:
Removes the management of production dependencies from the purview of buildout.

Dependencies that form the final product will no longer be version controlled by buildout. They are assumed to be available on the system already. This is taken care of by `make install-dependencies`. The only dependencies managed by buildout are for testing and development.

Requested reviews:
  MAAS Maintainers (maas-maintainers)
Related bugs:
  Bug #1055235 in MAAS: "Too easy to test with different dependencies versus production ones"
  https://bugs.launchpad.net/maas/+bug/1055235

For more details, see:
https://code.launchpad.net/~allenap/maas/prod-deps-not-in-buildout-precise/+merge/125973
-- 
https://code.launchpad.net/~allenap/maas/prod-deps-not-in-buildout-precise/+merge/125973
Your team MAAS Maintainers is requested to review the proposed merge of lp:~allenap/maas/prod-deps-not-in-buildout-precise into lp:maas/12.04-nocobbler.

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-08-21 15:59:40 +0000
+++ buildout.cfg	2012-09-24 10:54:34 +0000
@@ -31,10 +31,7 @@
 test-eggs =
   coverage
   fixtures
-  lockfile
-  lxml
   mock
-  netaddr
   nose
   nose-subunit
   postgresfixture
@@ -67,21 +64,6 @@
 eggs =
   ${maas:dev-eggs}
   ${maas:test-eggs}
-  celery
-  convoy
-  django
-  django-piston
-  docutils
-  oauth
-  oops
-  oops-datedir-repo
-  oops-wsgi
-  psycopg2
-  pyasn1
-  rabbitfixture
-  South
-  Tempita
-  twisted
 entry-points =
   maas=django.core.management:execute_from_command_line
 initialization =
@@ -95,6 +77,7 @@
 recipe = zc.recipe.egg
 eggs =
   ${maas:eggs}
+  rabbitfixture
 entry-points =
   test.maas=django.core.management:execute_from_command_line
 initialization =
@@ -110,6 +93,7 @@
 recipe = zc.recipe.egg
 eggs =
   ${maas:eggs}
+  rabbitfixture
 entry-points =
   test.maastesting=nose.core:TestProgram
 initialization =
@@ -124,13 +108,6 @@
 [pserv]
 recipe = zc.recipe.egg
 eggs =
-  formencode
-  oops-datedir-repo
-  oops-twisted
-  pyyaml
-  Tempita
-  twisted
-  txamqp
 entry-points =
   maas-provision=provisioningserver.__main__:main
   twistd.pserv=twisted.scripts.twistd:run
@@ -178,7 +155,6 @@
   ${maas:eggs}
   ${pserv:eggs}
   ${common:test-eggs}
-  ipython
 extra-paths = ${common:extra-paths}
 interpreter = py
 scripts = ipython=ipy
@@ -186,11 +162,5 @@
 [txlongpoll]
 recipe = z3c.recipe.scripts
 eggs =
-  txlongpoll
-  oops-datedir-repo
-  oops-twisted
-  pyyaml
-  twisted
-  txamqp
 entry-points = twistd.txlongpoll=twisted.scripts.twistd:run
 scripts = twistd.txlongpoll

=== modified file 'required-packages/base'
--- required-packages/base	2012-08-23 16:41:56 +0000
+++ required-packages/base	2012-09-24 10:54:34 +0000
@@ -22,6 +22,7 @@
 python-netaddr
 python-oauth
 python-oops
+python-oops-amqp
 python-oops-datedir-repo
 python-oops-twisted
 python-oops-wsgi
@@ -30,6 +31,7 @@
 python-tempita
 python-twisted
 python-txamqp
+python-txlongpoll
 python-yaml
 rabbitmq-server
 syslinux-common

=== modified file 'required-packages/dev'
--- required-packages/dev	2012-08-31 11:28:01 +0000
+++ required-packages/dev	2012-09-24 10:54:34 +0000
@@ -1,7 +1,8 @@
+avahi-utils
 build-essential
-avahi-utils
 curl
 firefox
+ipython
 make
 python-lxml
 python-pip

=== modified file 'versions.cfg'
--- versions.cfg	2012-08-21 15:59:40 +0000
+++ versions.cfg	2012-09-24 10:54:34 +0000
@@ -1,63 +1,22 @@
 [versions]
-<= versions-run
-   versions-dev
+<= versions-dev
    versions-doc
    versions-auto
 
-[versions-run]
-# Actually, we depend on the version of django in Ubuntu precise
-# which contains the backported fix for
-# https://code.djangoproject.com/ticket/16250
-# Otherwise, psycopg2 > 2.4.1 is problematic with Django 1.3.1.
-Django = 1.3.1
-# psycopg2 = 2.4.1
-psycopg2 = 2.4.4
-
-# Versions in Precise
-amqplib = 1.0.0
-anyjson = 0.3.1
-avahi = 0.6.30
-celery = 2.4.6
-convoy = 0.2.2
-dbus = 1.0.0
-django-picklefield = 0.1.9
-django-piston = 0.2.3
-FormEncode = 1.2.4
-kombu = 1.4.3
-lockfile = 0.8
-netaddr = 0.7.5
-oauth = 1.0.1
-oops = 0.0.10
-oops-amqp = 0.0.6
-oops-datedir-repo = 0.0.17
-oops-twisted = 0.0.6
-oops-wsgi = 0.0.9
-postgresfixture = 0.1.2
-pyasn1 = 0.0.11a
-pymongo = 2.1.1
-python-dateutil = 1.5
-PyYAML = 3.10
-saucelabsfixture = 0.1
-setuptools = 0.6.24
-South = 0.7.3
-Tempita = 0.5.1
-Twisted = 11.1.0
-txAMQP = 0.5
-txlongpoll = 0.3.1
-
 [versions-doc]
 # Versions in Precise
 docutils = 0.8.1
 Jinja2 = 2.6
 Pygments = 1.4
 Sphinx = 1.1.3
-lxml = 2.3.2
 
 [versions-dev]
-ipython = 0.12
 # Bug 251 is problematic in 0.9.2.
 django-debug-toolbar = 0.9.1
+ipython = 0.12.1
 mock = 1.0b1
+postgresfixture = 0.1.2
+saucelabsfixture = 0.1
 
 [versions-auto]
 # Added by Buildout Versions at 2012-02-24 15:51:04.865203