summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2015-07-31 23:01:43 -0400
committerJames Cammarata <jimi@sngx.net>2015-07-31 23:01:43 -0400
commit13b8a57d3df432c0e96e85d85f5c82d8c571f5f3 (patch)
treef408d350f7d40c2fd2581f2957407295b3f64bc1 /tox.ini
parent7c332b63dc6da749fbcf0dfd7e9fae1793201660 (diff)
downloadansible-13b8a57d3df432c0e96e85d85f5c82d8c571f5f3.tar.gz
Undo previous travis/tox fixes and fix underlying issue
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 2d6f1c33ff..dd94e045ab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,12 +9,12 @@ whitelist_externals = make
[testenv:py26]
commands =
python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' .
- #python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils
+ python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils
make tests
deps = -r{toxinidir}/test-requirements.txt
whitelist_externals =
make
- #python2.4
+ python2.4
[testenv:py27]
commands =