AC-474. Updates to contributing doc, along with related Makefile, testing and settings changes.

This commit is contained in:
Chris Church
2013-09-24 21:40:53 -04:00
parent 4b09ba4c83
commit 9fc46e6292
19 changed files with 109 additions and 136 deletions

11
tox.ini
View File

@@ -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}