Refactor tox a bit

This commit is contained in:
James Page 2016-02-16 07:23:02 +00:00
parent b87ebd92d1
commit f529888796
3 changed files with 5 additions and 16 deletions

View File

@ -1,6 +0,0 @@
PyYAML==3.10
simplejson==2.3.2
netifaces==0.8
netaddr==0.7.10
Jinja2==2.6
six==1.1.0

View File

@ -1,4 +1,4 @@
PyYAML==3.10
PyYAML>=3.10
simplejson==3.3.1
netifaces==0.8
netaddr==0.7.10

13
tox.ini
View File

@ -1,6 +1,6 @@
[tox]
# Default to current LTS
envlist = pep8,py27-trusty
envlist = pep8,py27
skipsdist = True
[testenv]
@ -11,19 +11,14 @@ install_command =
pip install --allow-unverified python-apt {opts} {packages}
commands = ostestr {posargs}
[testenv:py27-precise]
[testenv:py27]
basepython = python2.7
deps = -r{toxinidir}/requirements-precise.txt
-r{toxinidir}/test-requirements.txt
[testenv:py27-trusty]
basepython = python2.7
deps = -r{toxinidir}/requirements-trusty.txt
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:pep8]
basepython = python2.7
deps = -r{toxinidir}/requirements-trusty.txt
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = flake8 {posargs} hooks unit_tests tests
charm proof