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: I68ece8406fb1d4e082a42db8e76e17b1aaa7e775
Fixes: bug #1179008
This commit is contained in:
Ruby Loo
2013-05-22 20:12:08 +00:00
parent 986fa041a7
commit 5740920bb3
7 changed files with 8 additions and 8 deletions
@@ -123,7 +123,7 @@ You can manually install the virtual environment instead of having
python tools/install_venv.py python tools/install_venv.py
This will install all of the Python packages listed in the 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 additional packages (pip, distribute, greenlet) that are installed
by the ``tools/install_venv.py`` file into the virutalenv. by the ``tools/install_venv.py`` file into the virutalenv.
+1 -1
View File
@@ -100,7 +100,7 @@ If you wish to recreate the virtualenv, call ``run_tests.sh`` with the flag::
-f, --force -f, --force
Recreating the virtualenv is useful if the package dependencies have changed 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 ``tools/install_venv.py`` files have changed, it's a good idea to recreate the
virtualenv. virtualenv.
+2 -2
View File
@@ -56,8 +56,8 @@ def main(argv):
if os.environ.get('venv'): if os.environ.get('venv'):
venv = os.environ['venv'] venv = os.environ['venv']
pip_requires = os.path.join(root, 'tools', 'pip-requires') pip_requires = os.path.join(root, 'requirements.txt')
test_requires = os.path.join(root, 'tools', 'test-requires') test_requires = os.path.join(root, 'test-requirements.txt')
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
project = 'Nova' project = 'Nova'
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
+2 -2
View File
@@ -25,8 +25,8 @@ def main(argv):
venv = os.environ['VIRTUAL_ENV'] venv = os.environ['VIRTUAL_ENV']
pip_requires = os.path.join(root, 'tools', 'pip-requires') pip_requires = os.path.join(root, 'requirements.txt')
test_requires = os.path.join(root, 'tools', 'test-requires') test_requires = os.path.join(root, 'test-requirements.txt')
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
project = 'nova' project = 'nova'
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
+2 -2
View File
@@ -7,8 +7,8 @@ setenv = VIRTUAL_ENV={envdir}
LANG=en_US.UTF-8 LANG=en_US.UTF-8
LANGUAGE=en_US:en LANGUAGE=en_US:en
LC_ALL=C LC_ALL=C
deps = -r{toxinidir}/tools/pip-requires deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/tools/test-requires -r{toxinidir}/test-requirements.txt
commands = commands =
python tools/patch_tox_venv.py python tools/patch_tox_venv.py
python setup.py testr --slowest --testr-args='{posargs}' python setup.py testr --slowest --testr-args='{posargs}'