summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorMarius Gedminas <marius@gedmin.as>2015-10-04 10:57:49 +0300
committerMarius Gedminas <marius@gedmin.as>2015-10-04 10:57:49 +0300
commite9b114a39b67ade4fbc4a1b928a759aa389657b8 (patch)
tree65e3176aff286b63071e085508ade96c63108a56 /tox.ini
parent3e0330ad3b7485fa4d9a2568b1e6a68d64b41645 (diff)
downloadansible-e9b114a39b67ade4fbc4a1b928a759aa389657b8.tar.gz
Simplify tox.ini
Use the factor-conditional settings feature of tox >= 1.8 to reduce duplication: https://tox.readthedocs.org/en/latest/config.html#factors-and-factor-conditional-settings
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini21
1 files changed, 4 insertions, 17 deletions
diff --git a/tox.ini b/tox.ini
index 9eef9fe721..c23f8dc576 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,25 +2,12 @@
envlist = py26,py27,py34
[testenv]
-commands = make tests
deps = -r{toxinidir}/test-requirements.txt
whitelist_externals = make
-
-[testenv:py26]
-commands =
- python --version
- python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' lib test contrib
- make tests
-
-[testenv:py27]
-commands =
- python --version
- python -m compileall -fq -x 'test|samples' lib test contrib
- make tests
-
-[testenv:py34]
commands =
python --version
- python -m compileall -fq -x 'lib/ansible/module_utils|lib/ansible/modules' lib test contrib
+ py26: python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' lib test contrib
+ py27: python -m compileall -fq -x 'test|samples' lib test contrib
+ py34: python -m compileall -fq -x 'lib/ansible/module_utils|lib/ansible/modules' lib test contrib
# Unittests need lots of work to make code python3 compatible
- #make tests
+ py{26,27}: make tests