Rename requires files to standard names

From bug report:
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.

Change-Id: Ie0bdb4908f45e47db43e84cd0c5fdc5263c035f4
Fixes: Bug #1179008

diff --git a/heat/openstack/common/setup.py b/heat/openstack/common/setup.py
index fb187fff465424ee7b677c8ed86c4aa01bf4eec8..e298d7307d7ec0a184e5237aadf0528be914438b 100644 (file)
--- a/heat/openstack/common/setup.py
+++ b/heat/openstack/common/setup.py
@@ -61,8 +61,7 @@ def get_reqs_from_files(requirements_files):
     return []
 
 
-def parse_requirements(requirements_files=['requirements.txt',
-                                           'tools/pip-requires']):
+def parse_requirements(requirements_files=['requirements.txt']):
     requirements = []
     for line in get_reqs_from_files(requirements_files):
         # For the requirements list, we need to inject only the portion
@@ -90,8 +89,7 @@ def parse_requirements(requirements_files=['requirements.txt',
     return requirements
 
 
-def parse_dependency_links(requirements_files=['requirements.txt',
-                                               'tools/pip-requires']):
+def parse_dependency_links(requirements_files=['requirements.txt']):
     dependency_links = []
     # dependency_links inject alternate locations to find packages listed
     # in requirements

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 36724278cf3eee239de772c1c585cf407c7b9527..104dd42acc3f3872b4f9356f0910d5cfab272b96 100644 (file)
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -56,8 +56,8 @@ def main(argv):
     if os.environ.get('venv'):
         venv = os.environ['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 = 'Heat'
     install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,

diff --git a/tox.ini b/tox.ini
index 99e473e3f3b311de1d948b6f2bca84280b7e8f01..b04c7a7697adfde9075054a8aed9fda957e2e2a5 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
 commands =
   python tools/patch_tox_venv.py
   python setup.py testr --slowest --testr-args='{posargs}'