diff options
| author | David Lyle <david.lyle@hp.com> | 2014-02-03 11:34:54 -0700 |
|---|---|---|
| committer | David Lyle <david.lyle@hp.com> | 2014-03-18 16:45:45 -0600 |
| commit | 57717db0ef2355af9aac1b63eefe9900dda7998a (patch) | |
| tree | 304c74ca1fae647328bb987647aa725ce961a549 /tox.ini | |
| parent | aa79d1ad0551e950b6d28f6b2d14e837f6303ad1 (diff) | |
| download | django_openstack_auth-57717db0ef2355af9aac1b63eefe9900dda7998a.tar.gz | |
Adding Django 1.6 support
Bumping the upper version of Django to include 1.6.
Adding a tox env to maintain support for Django 1.5 and fixing
env for django 1.4
Implements blueprint django-16-support
Change-Id: I093b38f85bea1fbd7641571a3871a721abadd37c
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -1,7 +1,7 @@ [tox] minversion = 1.6 skipsdist = True -envlist = py26,py27,py27dj14,pep8,py33 +envlist = py26,py27,py27dj14,py27dj15,pep8,py33 [testenv] usedevelop = True @@ -16,11 +16,13 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = python openstack_auth/tests/run_tests.py +[testenv:py27dj15] +commands = pip install django>=1.5,<1.6 + python openstack_auth/tests/run_tests.py + [testenv:py27dj14] -deps = pbr>=0.5.21,<1.0 - Django==1.4 - python-keystoneclient>=0.3.2 - -r{toxinidir}/test-requirements.txt +commands = pip install django==1.4 + python openstack_auth/tests/run_tests.py [testenv:pep8] commands = flake8 |