← Back to team overview

maas-devel team mailing list archive

[Merge] lp:~allenap/maas/psycopg2-2.4.1 into lp:maas

 

Gavin Panella has proposed merging lp:~allenap/maas/psycopg2-2.4.1 into lp:maas.

Requested reviews:
  MaaS Developers (maas-devel)

For more details, see:
https://code.launchpad.net/~allenap/maas/psycopg2-2.4.1/+merge/88880
-- 
https://code.launchpad.net/~allenap/maas/psycopg2-2.4.1/+merge/88880
Your team MaaS Developers is requested to review the proposed merge of lp:~allenap/maas/psycopg2-2.4.1 into lp:maas.
=== modified file 'buildout.cfg'
--- buildout.cfg	2012-01-17 14:36:51 +0000
+++ buildout.cfg	2012-01-17 16:05:31 +0000
@@ -12,6 +12,9 @@
 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]
@@ -19,10 +22,11 @@
 settings = development
 eggs =
   django
+  django-debug-toolbar
   django-piston
+  psycopg2
+  rabbitfixture
   South
-  django-debug-toolbar
-  rabbitfixture
 project = maas
 projectegg = maas
 test = maasserver


Follow ups