Rename requires files to standard names.

Fixes bug 1179008. Change-Id: I6765bb82df1ae672790662a30ee3527450685036
openstack · May 20, 2013 · c82a811 · c82a811
1 parent aa28083
commit c82a811
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/tools/pip-requires → requirements.txt b/tools/pip-requires → requirements.txt
diff --git a/tools/test-requires → test-requirements.txt b/tools/test-requires → test-requirements.txt
diff --git a/tools/install_venv.py b/tools/install_venv.py
@@ -31,8 +31,8 @@
 
 ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 VENV = os.path.join(ROOT, '.venv')
-PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
-TEST_REQUIRES = os.path.join(ROOT, 'tools', 'test-requires')
+PIP_REQUIRES = os.path.join(ROOT, 'requirements.txt')
+TEST_REQUIRES = os.path.join(ROOT, 'test-requirements.txt')
 PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
 
 

diff --git a/tox.ini b/tox.ini
@@ -7,8 +7,8 @@ setenv = VIRTUAL_ENV={envdir}
          LANGUAGE=en_US:en
          LC_ALL=C
 
-deps = -r{toxinidir}/tools/pip-requires
-       -r{toxinidir}/tools/test-requires
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --testr-args='{posargs}'
 
 [testenv:pep8]