summaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorChris Church <chris@ninemoreminutes.com>2013-09-25 03:40:53 +0200
committerChris Church <chris@ninemoreminutes.com>2013-09-25 03:41:00 +0200
commit9fc46e6292fcad3a3504744d13c30538c1c2f000 (patch)
tree33891781dc795afee3f56d94cbdf096695087a08 /tox.ini
parentAC-466. Fixed issue with refresh timer randomly quitting. Fixed project autho... (diff)
downloadawx-9fc46e6292fcad3a3504744d13c30538c1c2f000.tar.xz
awx-9fc46e6292fcad3a3504744d13c30538c1c2f000.zip
AC-474. Updates to contributing doc, along with related Makefile, testing and settings changes.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini11
1 files changed, 5 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini
index b28f5bbd82..bc535de005 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,7 @@ envlist =
[testenv]
commands = python manage.py test main
deps =
- ansible==1.2.3
- PyYAML
+ ansible==1.3.1
python-ldap
setenv =
DJANGO_SETTINGS_MODULE = awx.settings.development
@@ -17,23 +16,23 @@ downloadcache = {toxworkdir}/cache
[testenv:py26-dj14]
basepython = python2.6
deps =
- Django==1.4.7
+ Django==1.4.8
{[testenv]deps}
[testenv:py27-dj14]
basepython = python2.7
deps =
- Django==1.4.7
+ Django==1.4.8
{[testenv]deps}
[testenv:py26-dj15]
basepython = python2.6
deps =
- Django==1.5.3
+ Django==1.5.4
{[testenv]deps}
[testenv:py27-dj15]
basepython = python2.7
deps =
- Django==1.5.3
+ Django==1.5.4
{[testenv]deps}