Add requirements-test.txt

It's annoying that Django is not installed by default when setting up
a development environment. This is currently necessary because tox
uses these requirements files and it needs to test against multiple
versions of Django. Resolve this issue by adding a 'requirements-test'
file, thus allowing for Django-ful and Django-less scenarios.

This also allows us to delete 'requirements-base', which was a good
idea but alas contained too few options to really be viable. A little
duplication is better here.

Signed-off-by: Stephen Finucane <stephen.finucane@intel.com>

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 12b8bef3365458ddf9ce5050ad35f3150fe3ff27..ecf989ff2d19b888a8d2a2c6d638af7d0aa94071 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,2 +1,2 @@
--r requirements-base.txt
-selenium
+-r requirements-dev.txt
+-r requirements-prod.txt

diff --git a/requirements-prod.txt b/requirements-prod.txt
index f2c440a73a5a954e56cd0100772085843236f6ae..5c825bc92b86d6c468f275c4978194fe91ade9b0 100644 (file)
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -1,2 +1,3 @@
 Django<1.9,>=1.8
--r requirements-base.txt
+MySQL-python==1.2.5
+python-dateutil==1.5

diff --git a/requirements-base.txt b/requirements-test.txt
similarity index 82%
rename from requirements-base.txt
rename to requirements-test.txt
index 58b34ec5ea8296f7c7125a8dbcd8630002317b47..035ce131edea9f37e7927cfc2b1ec41eebca7f35 100644 (file)
--- a/requirements-base.txt
+++ b/requirements-test.txt
@@ -1,2 +1,3 @@
 MySQL-python==1.2.5
 python-dateutil==1.5
+selenium

diff --git a/tox.ini b/tox.ini
index eaad4498bf8dce1ca793be52175a667a865d21d4..70b09a5f44eb7a12098d264c1de3e914f04765a4 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ skipsdist = True
 basepython =
     py27: python2.7
 deps =
-    -r{toxinidir}/requirements-dev.txt
+    -r{toxinidir}/requirements-test.txt
     django16: django>=1.6,<1.7
     django17: django>=1.7,<1.8
     django18: django>=1.8,<1.9