@@ -1,2 +1,2 @@
+MySQL-python==1.2.5
python-dateutil==1.5
-Django<1.8,>=1.7
@@ -1,2 +1,2 @@
-MySQL-python==1.2.5
+Django<1.9,>=1.8
-r requirements-base.txt
@@ -1,9 +1,27 @@
[tox]
-envlist = {py27}-django{15,16,17}, pep8
+minversion = 1.6
+envlist = {py27}-django{16,17,18}
skipsdist = True
+[testenv]
+basepython =
+ py27: python2.7
+deps =
+ -r{toxinidir}/docs/requirements-dev.txt
+ django16: django>=1.6,<1.7
+ django17: django>=1.7,<1.8
+ django18: django>=1.8,<1.9
+setenv =
+ DJANGO_SETTINGS_MODULE = patchwork.settings.dev
+commands =
+ {toxinidir}/manage.py test '{posargs:patchwork}'
+passenv =
+ http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
+ PW_TEST_DB_USER PW_TEST_DB_PASS
+
[testenv:pep8]
-deps = flake8
+basepython = python2.7
+deps = flake
commands = flake8 {posargs}
[flake8]
@@ -14,33 +32,17 @@ exclude = ./patchwork/tests
basepython = python2.7
deps =
pylint
- -r{toxinidir}/docs/requirements-django-1.7-mysql.txt
+ -r{toxinidir}/docs/requirements-prod.txt
commands = pylint patchwork --rcfile=pylint.rc
[testenv:coverage]
basepython = python2.7
deps =
coverage
- -r{toxinidir}/docs/requirements-django-1.6-mysql.txt
+ -r{toxinidir}/docs/requirements-prod.txt
setenv =
DJANGO_SETTINGS_MODULE = patchwork.settings.dev
commands =
coverage erase
- {toxinidir}/manage.py syncdb
coverage run --omit=*tox* --branch {toxinidir}/manage.py test patchwork
coverage report -m
-
-[testenv]
-basepython =
- py27: python2.7
-commands =
- {toxinidir}/manage.py syncdb
- {toxinidir}/manage.py test patchwork
-deps =
- python-dateutil==1.5
- MySQL-python==1.2.5
- django15: django<1.6,>=1.5
- django16: django<1.7,>=1.6
- django17: django<1.8,>=1.7
-setenv =
- DJANGO_SETTINGS_MODULE = patchwork.settings.dev
Since patchwork now supports Django 1.8 and no longer support 1.5, it is necessary to update the tox targets to validate this new subset of supported Django versions. In addition, the paths to the requirements.txt files were not updated as part of a rebase. Correct this oversight. Signed-off-by: Stephen Finucane <stephen.finucane@intel.com> --- docs/requirements-base.txt | 2 +- docs/requirements-prod.txt | 2 +- tox.ini | 42 ++++++++++++++++++++++-------------------- 3 files changed, 24 insertions(+), 22 deletions(-)