diff options
| author | Chris Church <chris@ninemoreminutes.com> | 2013-11-15 04:55:03 +0100 |
|---|---|---|
| committer | Chris Church <chris@ninemoreminutes.com> | 2013-11-15 04:55:03 +0100 |
| commit | 7cd270771315d27f3effec1daeda1992bf457f30 (patch) | |
| tree | 019f561f697614274e8fa5b7171c8bf7336732dc /tox.ini | |
| parent | AC-636 Fix existing projects with scm_type=null to always use empty string. U... (diff) | |
| download | awx-7cd270771315d27f3effec1daeda1992bf457f30.tar.xz awx-7cd270771315d27f3effec1daeda1992bf457f30.zip | |
Updated all vendored third-party packages.
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 24 |
1 files changed, 18 insertions, 6 deletions
@@ -1,11 +1,11 @@ [tox] envlist = - py26-dj14, py27-dj14, py26-dj15, py27-dj15 + py26-dj14, py27-dj14, py26-dj15, py27-dj15, py26-dj16, py27-dj16 [testenv] commands = python manage.py test main deps = - ansible==1.3.1 + ansible==1.3.4 python-ldap setenv = DJANGO_SETTINGS_MODULE = awx.settings.development @@ -16,23 +16,35 @@ downloadcache = {toxworkdir}/cache [testenv:py26-dj14] basepython = python2.6 deps = - Django==1.4.8 + Django==1.4.10 {[testenv]deps} [testenv:py27-dj14] basepython = python2.7 deps = - Django==1.4.8 + Django==1.4.10 {[testenv]deps} [testenv:py26-dj15] basepython = python2.6 deps = - Django==1.5.4 + Django==1.5.5 {[testenv]deps} [testenv:py27-dj15] basepython = python2.7 deps = - Django==1.5.4 + Django==1.5.5 + {[testenv]deps} + +[testenv:py26-dj16] +basepython = python2.6 +deps = + Django==1.6 + {[testenv]deps} + +[testenv:py27-dj16] +basepython = python2.7 +deps = + Django==1.6 {[testenv]deps} |