openstack
/
heat-dashboard
Code Issues Proposed changes

Adding django 1.6 support 

Adding tox config to maintain django 1.5 support.

Implements: blueprint django-1point6
Change-Id: Id51b61f8ec8f5a1f83b4d3520dfa4273f07db4cb
This commit is contained in:
David Lyle 2014-02-10 12:47:53 -07:00
parent a7bae23721
commit 1bcb924f71
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist = py26,py27,py27dj14,pep8,py33
envlist = py26,py27,py27dj14,py27dj15,pep8,py33
minversion = 1.6
skipsdist = True
@ -31,6 +31,11 @@ basepython = python2.7
commands = pip install django==1.4
/bin/bash run_tests.sh -N --no-pep8
[testenv:py27dj15]
basepython = python2.7
commands = pip install django>=1.5,<1.6
/bin/bash run_tests.sh -N --no-pep8
[testenv:py27integration]
basepython = python2.7
commands = /bin/bash run_tests.sh -N --integration