Add Django 1.5 and 1.6 to tox.ini

Both Django 1.5 and 1.6 are supported and should be tested against.
This patch adds the two corresponding configurations to tox.ini.

Change-Id: I72db0a1643da17bc5c35f863cb5e3b4b81fffab8
Closes-bug: #1306074
This commit is contained in:
Ana Krivokapic 2014-04-15 13:56:48 +02:00
parent 36a0bc621b
commit ea1b0dc5e6

14
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist = py26,py27,py27dj14,pep8
envlist = py26,py27,py27dj14,py27dj15,py27dj16,pep8
[testenv]
setenv = VIRTUAL_ENV={envdir}
@ -23,7 +23,17 @@ commands = /bin/bash run_tests.sh -N --coverage
[testenv:py27dj14]
basepython = python2.7
commands = pip install django==1.4
commands = pip install django>=1.4,<1.5
/bin/bash run_tests.sh -N
[testenv:py27dj15]
basepython = python2.7
commands = pip install django>=1.5,<1.6
/bin/bash run_tests.sh -N
[testenv:py27dj16]
basepython = python2.7
commands = pip install django>=1.6,<1.7
/bin/bash run_tests.sh -N
[tox:jenkins]