Change build matrix to test django 1.5 and 1.6
This commit is contained in:
parent
fca827025c
commit
4a79a1e9f9
2 changed files with 22 additions and 5 deletions
|
@ -8,7 +8,6 @@ python:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
matrix:
|
matrix:
|
||||||
- DJANGO='django>=1.4,<1.5'
|
|
||||||
- DJANGO='django>=1.5,<1.6'
|
- DJANGO='django>=1.5,<1.6'
|
||||||
- DJANGO='django>=1.6,<1.7'
|
- DJANGO='django>=1.6,<1.7'
|
||||||
|
|
||||||
|
@ -23,9 +22,6 @@ script: coverage run runtests.py
|
||||||
after_success: coveralls
|
after_success: coveralls
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
exclude:
|
|
||||||
- python: 3.3
|
|
||||||
env: DJANGO='django>=1.4,<1.5'
|
|
||||||
|
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- python: 3.3
|
- python: 3.3
|
||||||
|
|
23
tox.ini
23
tox.ini
|
@ -1,7 +1,28 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist = py26, py27
|
envlist = py26dj15, py26dj16, py27dj15, py27dj16
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
commands = python runtests.py
|
commands = python runtests.py
|
||||||
deps =
|
deps =
|
||||||
-r{toxinidir}/requirements-test.txt
|
-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}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue