From b11db36f471a854326cb23023332381664b09cbf Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 3 Jun 2013 18:42:06 -0400
Subject: [PATCH] Updated to use normal requirements names.

Change-Id: I20545a3250c7db826b5c9133b8a94e3a8b2a3dbf
---
 tools/pip-requires => requirements.txt       | 0
 tools/test-requires => test-requirements.txt | 0
 tools/install_venv.py                        | 4 ++--
 tox.ini                                      | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename tools/pip-requires => requirements.txt (100%)
 rename tools/test-requires => test-requirements.txt (100%)

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/tools/install_venv.py b/tools/install_venv.py
index b05a3f8748..4debd4c826 100755
--- a/tools/install_venv.py
+++ b/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])
 
 
diff --git a/tox.ini b/tox.ini
index 16c56181ab..99402f4322 100644
--- a/tox.ini
+++ b/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