Rename requires files to standard names.

Rename tools/pip-requires to requirements.txt and tools/test-requires
to test-requirements.txt. These are standard files, and tools in the
general world are growing intelligence about them.

Fixes: bug #1179008
Change-Id: I6f8a11988982133249d443403f63b4f8724e156e

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 ddb3d82c1e550e97001e549471b89e767e374e62..eda0ced903b49191d83b30736cd0503036337aed 100644 (file)
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -56,8 +56,8 @@ def print_help():
 def main(argv):
     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])
     project = 'Quantum'
     install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,

diff --git a/tools/patch_tox_venv.py b/tools/patch_tox_venv.py
index 5f09939cfab6257248258ccd0e5d7dedc9f08d8e..01ea05afb17afbb1857905e4e09150a4933643a7 100644 (file)
--- a/tools/patch_tox_venv.py
+++ b/tools/patch_tox_venv.py
@@ -25,8 +25,8 @@ def main(argv):
 
     venv = os.environ['VIRTUAL_ENV']
 
-    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])
     project = 'quantum'
     install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,

diff --git a/tox.ini b/tox.ini
index d266c7b253ce71ca2477441103d32357ca6e940c..3c4320ea927b56ce73d2def161bea986c7405284 100644 (file)
--- 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 =
   python tools/patch_tox_venv.py