diff --git a/.travis.yml b/.travis.yml index 2651587..0df0232 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ python: env: matrix: - - DJANGO='django>=1.4,<1.5' - DJANGO='django>=1.5,<1.6' - DJANGO='django>=1.6,<1.7' @@ -23,9 +22,6 @@ script: coverage run runtests.py after_success: coveralls matrix: - exclude: - - python: 3.3 - env: DJANGO='django>=1.4,<1.5' allow_failures: - python: 3.3 diff --git a/tox.ini b/tox.ini index ab91871..9bee8cf 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,28 @@ [tox] -envlist = py26, py27 +envlist = py26dj15, py26dj16, py27dj15, py27dj16 [testenv] commands = python runtests.py deps = -r{toxinidir}/requirements-test.txt + +[testenv:py26dj15] +deps = + django<1.6 + {[testenv]deps} + +[testenv:py26dj16] +deps = + django<1.7 + {[testenv]deps} + +[testenv:py27dj15] +deps = + django<1.6 + {[testenv]deps} + +[testenv:py27dj16] +deps = + django<1.7 + {[testenv]deps} +