| Message ID | 1447308313-4526-3-git-send-email-stephen.finucane@intel.com |
|---|---|
| State | Accepted |
| Headers | show |
On 12 Nov 06:05, Stephen Finucane wrote: > 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> Merged.
diff --git a/requirements-base.txt b/requirements-base.txt deleted file mode 100644 index 58b34ec..0000000 --- a/requirements-base.txt +++ /dev/null @@ -1,2 +0,0 @@ -MySQL-python==1.2.5 -python-dateutil==1.5 diff --git a/requirements-dev.txt b/requirements-dev.txt index 12b8bef..ecf989f 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 f2c440a..5c825bc 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-test.txt b/requirements-test.txt new file mode 100644 index 0000000..035ce13 --- /dev/null +++ b/requirements-test.txt @@ -0,0 +1,3 @@ +MySQL-python==1.2.5 +python-dateutil==1.5 +selenium diff --git a/tox.ini b/tox.ini index eaad449..70b09a5 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
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> --- requirements-base.txt | 2 -- requirements-dev.txt | 4 ++-- requirements-prod.txt | 3 ++- requirements-test.txt | 3 +++ tox.ini | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 requirements-base.txt create mode 100644 requirements-test.txt