Updated to use normal requirements names.

Change-Id: I20545a3250c7db826b5c9133b8a94e3a8b2a3dbf

tools/install_venv.py

@@ -31,8 +31,8 @@ import sys
 
 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])
 
 

tox.ini

@@ -3,8 +3,8 @@ envlist = py26,py27,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/tools/pip-requires
-       -r{toxinidir}/tools/test-requires
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
        setuptools_git>=0.4
 commands = {envpython} run_tests.py
         {envpython} run_tests.py --test-config=etc/tests/xml.localhost.test.conf