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
This commit is contained in:
parent
d1e7c9a220
commit
15a907c491
@ -121,7 +121,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.
|
||||||
|
|
||||||
|
@ -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.
|
||||||
|
|
||||||
|
@ -54,8 +54,8 @@ def print_help():
|
|||||||
def main(argv):
|
def main(argv):
|
||||||
root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
||||||
venv = os.path.join(root, '.venv')
|
venv = os.path.join(root, '.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')
|
||||||
project = 'Cinder'
|
project = 'Cinder'
|
||||||
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])
|
||||||
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
|
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
|
||||||
|
@ -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 = 'cinder'
|
project = 'cinder'
|
||||||
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
|
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
|
||||||
|
6
tox.ini
6
tox.ini
@ -13,8 +13,8 @@ setenv = VIRTUAL_ENV={envdir}
|
|||||||
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
|
||||||
nosetests {posargs}
|
nosetests {posargs}
|
||||||
@ -32,7 +32,7 @@ setenv = NOSE_WITH_COVERAGE=1
|
|||||||
|
|
||||||
[testenv:pylint]
|
[testenv:pylint]
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
deps = -r{toxinidir}/tools/pip-requires
|
deps = -r{toxinidir}/tools/requirements.txt
|
||||||
pylint==0.26.0
|
pylint==0.26.0
|
||||||
commands = bash tools/lintstack.sh
|
commands = bash tools/lintstack.sh
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user