diff --git a/tools/pip-requires b/requirements.txt similarity index 100% rename from tools/pip-requires rename to requirements.txt diff --git a/tools/test-requires b/test-requirements.txt similarity index 100% rename from tools/test-requires rename to test-requirements.txt diff --git a/tox.ini b/tox.ini index 3c5bf1462..2e4be8a80 100644 --- a/tox.ini +++ b/tox.ini @@ -2,8 +2,8 @@ envlist = py26,py27,pep8 [testenv] -deps = -r{toxinidir}/tools/test-requires - -r{toxinidir}/tools/pip-requires +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt setenv = VIRTUAL_ENV={envdir} EVENTLET_NO_GREENDNS=yes commands = @@ -26,14 +26,14 @@ commands = flake8 ceilometer setup.py bin/ceilometer-agent-central bin/ceilometer-agent-compute bin/ceilometer-collector bin/ceilometer-api tests [testenv:docs] -deps = -r{toxinidir}/tools/test-requires - -r{toxinidir}/tools/pip-requires +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt sphinxcontrib-httpdomain commands = python setup.py build_sphinx [testenv:venv] -deps = -r{toxinidir}/tools/test-requires - -r{toxinidir}/tools/pip-requires +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt sphinxcontrib-httpdomain commands = {posargs}