Tox updates.

This commit is contained in:
Chris Church
2013-09-12 10:10:01 -04:00
parent c9ed4fab37
commit e3f64c5860

View File

@@ -7,6 +7,7 @@ commands = python manage.py test main
deps = deps =
ansible==1.2.3 ansible==1.2.3
PyYAML PyYAML
python-ldap
setenv = setenv =
DJANGO_SETTINGS_MODULE = awx.settings.development DJANGO_SETTINGS_MODULE = awx.settings.development
# For OS X to be able to install pycrypto. # For OS X to be able to install pycrypto.
@@ -16,23 +17,23 @@ downloadcache = {toxworkdir}/cache
[testenv:py26-dj14] [testenv:py26-dj14]
basepython = python2.6 basepython = python2.6
deps = deps =
Django==1.4.6 Django==1.4.7
{[testenv]deps} {[testenv]deps}
[testenv:py27-dj14] [testenv:py27-dj14]
basepython = python2.7 basepython = python2.7
deps = deps =
Django==1.4.6 Django==1.4.7
{[testenv]deps} {[testenv]deps}
[testenv:py26-dj15] [testenv:py26-dj15]
basepython = python2.6 basepython = python2.6
deps = deps =
Django==1.5.2 Django==1.5.3
{[testenv]deps} {[testenv]deps}
[testenv:py27-dj15] [testenv:py27-dj15]
basepython = python2.7 basepython = python2.7
deps = deps =
Django==1.5.2 Django==1.5.3
{[testenv]deps} {[testenv]deps}