[trivial] Normalize tox config
This commit is contained in:
parent
7cde5b46c9
commit
6a31d59482
|
@ -0,0 +1,12 @@
|
||||||
|
# The order of packages is significant, because pip processes them in the order
|
||||||
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
|
# process, which may cause wedges in the gate later.
|
||||||
|
PyYAML>=3.1.0
|
||||||
|
simplejson>=2.2.0
|
||||||
|
netifaces>=0.10.4
|
||||||
|
netaddr>=0.7.12,!=0.7.16
|
||||||
|
Jinja2>=2.6 # BSD License (3 clause)
|
||||||
|
six>=1.9.0
|
||||||
|
dnspython>=1.12.0
|
||||||
|
psutil>=1.1.1,<2.0.0
|
||||||
|
python-keystoneclient>=1.6.0,!=1.8.0
|
|
@ -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
|
|
|
@ -1,6 +0,0 @@
|
||||||
PyYAML>=3.10
|
|
||||||
simplejson==3.3.1
|
|
||||||
netifaces==0.8
|
|
||||||
netaddr==0.7.10
|
|
||||||
Jinja2==2.7.2
|
|
||||||
six==1.5.2
|
|
|
@ -1,7 +0,0 @@
|
||||||
testtools==0.9.35
|
|
||||||
coverage==3.7.1
|
|
||||||
mock==1.0.1
|
|
||||||
flake8==2.1.0
|
|
||||||
# No version required
|
|
||||||
charm-tools
|
|
||||||
os-testr
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
# The order of packages is significant, because pip processes them in the order
|
||||||
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
|
# process, which may cause wedges in the gate later.
|
||||||
|
coverage>=3.6
|
||||||
|
mock>=1.2
|
||||||
|
flake8>=2.2.4,<=2.4.1
|
||||||
|
os-testr>=0.4.1
|
||||||
|
charm-tools
|
18
tox.ini
18
tox.ini
|
@ -1,6 +1,5 @@
|
||||||
[tox]
|
[tox]
|
||||||
# Default to current LTS
|
envlist = pep8,py27
|
||||||
envlist = pep8,py27-trusty
|
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
@ -10,20 +9,15 @@ install_command =
|
||||||
pip install --allow-unverified python-apt {opts} {packages}
|
pip install --allow-unverified python-apt {opts} {packages}
|
||||||
commands = ostestr {posargs}
|
commands = ostestr {posargs}
|
||||||
|
|
||||||
[testenv:py27-precise]
|
[testenv:py27]
|
||||||
basepython = python2.7
|
basepython = python2.7
|
||||||
deps = -r{toxinidir}/requirements/requirements-precise.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/requirements/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
[testenv:py27-trusty]
|
|
||||||
basepython = python2.7
|
|
||||||
deps = -r{toxinidir}/requirements/requirements-trusty.txt
|
|
||||||
-r{toxinidir}/requirements/test-requirements.txt
|
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python2.7
|
basepython = python2.7
|
||||||
deps = -r{toxinidir}/requirements/requirements-trusty.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/requirements/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = flake8 {posargs} actions hooks unit_tests tests
|
commands = flake8 {posargs} actions hooks unit_tests tests
|
||||||
charm proof
|
charm proof
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue