summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lyle <david.lyle@intel.com>2015-04-29 18:39:08 -0600
committerDavid Lyle <david.lyle@intel.com>2015-04-29 18:40:31 -0600
commit6b9e9b593b76b590e97621b56911fe3d136256db (patch)
tree2b65880449edbc337391e7cf7eeb94b2579ab730
parent98fc934002a5d0b08e62a156c9c8a66c17896dd1 (diff)
downloaddjango_openstack_auth-6b9e9b593b76b590e97621b56911fe3d136256db.tar.gz
Adding 1.6 job for tox
Default test run is against Django 1.7, adding job for Django 1.6 Change-Id: Ic63bad1ef7bf8e19ec1aae48ca4eb52fa1ef2dfd
-rw-r--r--tox.ini6
1 files changed, 5 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 3b78a4e..6e4e30c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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}