openstack/charm-ceph-osd
Code Issues Proposed changes

Make things alot simpler

Browse Source
This commit is contained in:
James Page 2015-10-30 12:37:15 +09:00
parent ab8a2f4aed
commit ab2c851e5c
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
requirements/requirements-trusty.txt → requirements.txt
View File

6
requirements/requirements-precise.txt
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

0
requirements/test-requirements.txt → test-requirements.txt
View File

18
tox.ini
View File

@ -1,6 +1,5 @@
[tox] [tox]
# Default to current LTS envlist = lint,py27
envlist = lint,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:lint] [testenv:lint]
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} hooks unit_tests tests commands = flake8 {posargs} hooks unit_tests tests
charm proof charm proof