Merge "Adding 1.6 job for tox"

This commit is contained in:
Jenkins
2015-05-02 05:27:42 +00:00
committed by Gerrit Code Review

View File

@@ -1,7 +1,7 @@
[tox]
minversion = 1.6
skipsdist = True
envlist = py27,py27dj14,py27dj15,pep8,py33,py34
envlist = py27,py27dj14,py27dj15,py27dj16,pep8,py33,py34
[testenv]
usedevelop = True
@@ -16,6 +16,10 @@ deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = python openstack_auth/tests/run_tests.py {posargs}
[testenv:py27dj16]
commands = pip install django>=1.6,<1.7
python openstack_auth/tests/run_tests.py {posargs}
[testenv:py27dj15]
commands = pip install django>=1.5,<1.6
python openstack_auth/tests/run_tests.py {posargs}