Make things alot simpler

This commit is contained in:
James Page 2015-10-30 12:30:49 +09:00
parent fbde2aab1f
commit 89398bd217
4 changed files with 6 additions and 17 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

17
tox.ini
View File

@ -1,6 +1,6 @@
[tox]
# Default to current LTS
envlist = lint,py27-trusty
envlist = lint,py27
skipsdist = True
[testenv]
@ -10,20 +10,15 @@ 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/requirements-precise.txt
-r{toxinidir}/requirements/test-requirements.txt
[testenv:py27-trusty]
basepython = python2.7
deps = -r{toxinidir}/requirements/requirements-trusty.txt
-r{toxinidir}/requirements/test-requirements.txt
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:lint]
basepython = python2.7
deps = -r{toxinidir}/requirements/requirements-trusty.txt
-r{toxinidir}/requirements/test-requirements.txt
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = flake8 {posargs} hooks unit_tests tests
charm proof