improved version management; adding vm-specific pip reqs that inherits prod.

diff --git a/fabfile.py b/fabfile.py
index 9fb33b6371ed7d806009159e9c0494fd2a3bcaaf..e4148d68d64ed3976286065c917ac1d8cf6de1eb 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -185,7 +185,7 @@ def restart_gunicorn():
 ####### Update Requirements
 @task
 def update_reqs():
-    virtenv_exec('pip install -r {0}/reqs/prod.txt'.format(env.code_root))
+    virtenv_exec('pip install --upgrade -r {0}/reqs/prod.txt'.format(env.code_root))
 
 ####### Pull new code
 @task

diff --git a/reqs/common.txt b/reqs/common.txt
index a535c09d4d8fc116668fbafc266f920d584692ff..ca53bf92cc55b9c330ccda3257592bc928b6ed74 100644 (file)
--- a/reqs/common.txt
+++ b/reqs/common.txt
@@ -1,4 +1,4 @@
-Django>=1.5.0,<=1.5.9
+Django>=1.5.0,<1.6.0
 django-celery==3.0.21
 django-compressor==1.2
 Fabric==1.5.3

diff --git a/reqs/vmdev.txt b/reqs/vmdev.txt
new file mode 100644 (file)
index 0000000..40351d3
--- /dev/null
+++ b/reqs/vmdev.txt
@@ -0,0 +1,10 @@
+-r prod.txt
+django-debug-toolbar==0.9.4
+ipython==0.13.1
+ipdb==0.7
+django-extensions==1.0.3 # some extra debugging tools for manage.py
+# Testing requirements
+django-nose==1.1
+coverage==3.6
+selenium==2.38.4
+mock