Merge "remove django<1.7 from tests"

This commit is contained in:
Jenkins 2015-08-14 08:42:33 +00:00 committed by Gerrit Code Review
commit 5796aa97a7

11
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist = py27,py27dj14,py27dj15,pep8,py33,py34
envlist = py27,py27dj17,py27dj18,pep8,py34
minversion = 1.6
skipsdist = True
@ -30,14 +30,15 @@ commands = {posargs}
[testenv:cover]
commands = /bin/bash run_tests.sh -N --no-pep8 --coverage {posargs}
[testenv:py27dj14]
[testenv:py27dj17]
basepython = python2.7
commands = pip install django>=1.4,<1.5
commands = pip install django>=1.7,<1.8
/bin/bash run_tests.sh -N --no-pep8 {posargs}
[testenv:py27dj15]
# Django-1.8 is LTS
[testenv:py27dj18]
basepython = python2.7
commands = pip install django>=1.5,<1.6
commands = pip install django>=1.8,<1.9
/bin/bash run_tests.sh -N --no-pep8 {posargs}
[testenv:py27integration]