summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.rst2
-rw-r--r--requirements.txt (renamed from tools/pip-requires)0
-rw-r--r--test-requirements.txt (renamed from tools/test-requires)0
-rw-r--r--tox.ini4
4 files changed, 3 insertions, 3 deletions
diff --git a/README.rst b/README.rst
index 33b88ab..c115054 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
index 067af58..067af58 100644
--- a/tools/pip-requires
+++ b/requirements.txt
diff --git a/tools/test-requires b/test-requirements.txt
index 62c0eea..62c0eea 100644
--- a/tools/test-requires
+++ b/test-requirements.txt
diff --git a/tox.ini b/tox.ini
index 93ccb1e..946decd 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}