Merge pull request #12627 from mgedmin/tox

Add Python 3.5 to tox.ini and Travis
This commit is contained in:
Toshio Kuratomi 2015-10-09 11:42:34 -07:00
commit 17c75df0ae
2 changed files with 7 additions and 25 deletions

View file

@ -5,12 +5,14 @@ env:
- TOXENV=py26 - TOXENV=py26
- TOXENV=py27 - TOXENV=py27
- TOXENV=py34 - TOXENV=py34
- TOXENV=py35
addons: addons:
apt: apt:
sources: sources:
- deadsnakes - deadsnakes
packages: packages:
- python2.4 - python2.4
- python3.5-dev
install: install:
- pip install tox PyYAML Jinja2 sphinx - pip install tox PyYAML Jinja2 sphinx
script: script:

30
tox.ini
View file

@ -1,33 +1,13 @@
[tox] [tox]
envlist = {py26,py27,py34} envlist = py26,py27,py34,py35
[testenv] [testenv]
commands = make tests
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
whitelist_externals = make whitelist_externals = make
[testenv:py26]
commands = commands =
python --version python --version
python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' lib test contrib py26: python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' lib test contrib
make tests py27: python -m compileall -fq -x 'test|samples' lib test contrib
deps = -r{toxinidir}/test-requirements.txt py{34,35}: python -m compileall -fq -x 'lib/ansible/module_utils|lib/ansible/modules' lib test contrib
whitelist_externals =
make
[testenv:py27]
commands =
python --version
python -m compileall -fq -x 'test|samples' lib test contrib
make tests
deps = -r{toxinidir}/test-requirements.txt
whitelist_externals = make
[testenv:py34]
commands =
python --version
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 # Unittests need lots of work to make code python3 compatible
#make tests py{26,27}: make tests
deps = -r{toxinidir}/test-requirements.txt
whitelist_externals = make