From: Stephen Finucane Date: Thu, 12 Nov 2015 04:54:31 +0000 (+0000) Subject: Add requirements-test.txt X-Git-Tag: v1.1.0~109 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73044ac036350686a605e7aff486566d0dbb1d82;p=thirdparty%2Fpatchwork.git 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 --- diff --git a/requirements-dev.txt b/requirements-dev.txt index 12b8bef3..ecf989ff 100644 --- 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 f2c440a7..5c825bc9 100644 --- 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 58b34ec5..035ce131 100644 --- 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 eaad4498..70b09a5f 100644 --- 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