From: Zhenguo Niu <Niu.ZGlinux@gmail.com>
Date: Wed, 29 May 2013 08:50:03 +0000 (+0800)
Subject: Rename requires files to standard names.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=15a907c491e9d344fd1f70becc883342f3102798;p=openstack-build%2Fcinder-build.git

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.

Change-Id: Ifb2735151dc8c7f89ec01d237226669f7051ffa8
Fixes: bug #1179008
---

diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst
index 49b899504..7c740d12f 100644
--- a/doc/source/devref/development.environment.rst
+++ b/doc/source/devref/development.environment.rst
@@ -121,7 +121,7 @@ You can manually install the virtual environment instead of having
   python tools/install_venv.py
 
 This will install all of the Python packages listed in the
-``tools/pip-requires`` file into your virtualenv. There will also be some
+``requirements.txt`` file into your virtualenv. There will also be some
 additional packages (pip, distribute, greenlet) that are installed
 by the ``tools/install_venv.py`` file into the virutalenv.
 
diff --git a/doc/source/devref/unit_tests.rst b/doc/source/devref/unit_tests.rst
index b42386b0d..b040122a0 100644
--- a/doc/source/devref/unit_tests.rst
+++ b/doc/source/devref/unit_tests.rst
@@ -100,7 +100,7 @@ If you wish to recreate the virtualenv, call ``run_tests.sh`` with the flag::
     -f, --force
 
 Recreating the virtualenv is useful if the package dependencies have changed
-since the virtualenv was last created. If the ``tools/pip-requires`` or
+since the virtualenv was last created. If the ``requirements.txt`` or
 ``tools/install_venv.py`` files have changed, it's a good idea to recreate the
 virtualenv.
 
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 e967323a0..1a4ae4a04 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -54,8 +54,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')
     project = 'Cinder'
     py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
     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 dc87af99f..710010957 100644
--- 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 = 'cinder'
     install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
diff --git a/tox.ini b/tox.ini
index 2e5e1707c..bf1c25664 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,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 tools/patch_tox_venv.py
   nosetests {posargs}
@@ -32,7 +32,7 @@ setenv = NOSE_WITH_COVERAGE=1
 
 [testenv:pylint]
 setenv = VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/tools/pip-requires
+deps = -r{toxinidir}/tools/requirements.txt
        pylint==0.26.0
 commands = bash tools/lintstack.sh