diff --git a/README.rst b/README.rst index 33b88ab3d..c11505445 100644 --- a/README.rst +++ b/README.rst @@ -27,5 +27,5 @@ To run tests in virtualenvs (preferred): To run tests in the current environment: - sudo pip install -r tools/pip-requires + sudo pip install -r requirements.txt nosetests 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 93ccb1ed0..946decdde 100644 --- a/tox.ini +++ b/tox.ini @@ -9,8 +9,8 @@ setenv = VIRTUAL_ENV={envdir} NOSE_OPENSTACK_YELLOW=0.025 NOSE_OPENSTACK_SHOW_ELAPSED=1 NOSE_OPENSTACK_STDOUT=1 -deps = -r{toxinidir}/tools/pip-requires - -r{toxinidir}/tools/test-requires +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = python tools/patch_tox_venv.py nosetests --with-doctest --exclude-dir=tests/testmods {posargs}