consolidating psycopg2 requirement and mirroring commit c7dcc25de from dev.txt onto...

diff --git a/reqs/common.txt b/reqs/common.txt
index bce89ee187923f94718be3978aef370449fcdae6..b89f403f323cacc48b901b958d36a0000aca7266 100644 (file)
--- a/reqs/common.txt
+++ b/reqs/common.txt
@@ -24,3 +24,4 @@ django-storages==1.1.4
 django-reversion
 django-ajax-selects
 git+https://github.com/btbonval/django-ajax-selects-cascade.git
+psycopg2

diff --git a/reqs/dev.txt b/reqs/dev.txt
index 0c907d379e4d1ef3a5e4e90e6666569415b68838..17e97259e9a576b55d9f9057195fae1e0a809d90 100644 (file)
--- a/reqs/dev.txt
+++ b/reqs/dev.txt
@@ -9,4 +9,3 @@ django-nose==1.1
 coverage==3.6
 selenium==2.38.4
 mock
-psycopg2

diff --git a/reqs/prod.txt b/reqs/prod.txt
index e3fef51c2d0ee8f4f14fbb3a321c27052521dfa0..41aa7b5c9049971239fdcb290bebb9eb0f68605b 100644 (file)
--- a/reqs/prod.txt
+++ b/reqs/prod.txt
@@ -3,5 +3,4 @@ cssmin==0.1.4
 pylibmc==1.2.3
 gunicorn==0.14.3
 jsmin==2.0.2
-psycopg2==2.4.5
 amqplib==1.0.2

diff --git a/reqs/vmdev.txt b/reqs/vmdev.txt
index 40351d3c534e24714ab41a4dcd7502313c91ba83..082bbd4de8131214c589bb125eb473e892ba1e5d 100644 (file)
--- a/reqs/vmdev.txt
+++ b/reqs/vmdev.txt
@@ -1,5 +1,5 @@
 -r prod.txt
-django-debug-toolbar==0.9.4
+django-debug-toolbar
 ipython==0.13.1
 ipdb==0.7
 django-extensions==1.0.3 # some extra debugging tools for manage.py