diff options
| -rw-r--r-- | doc/source/devref/development.environment.rst | 2 | ||||
| -rw-r--r-- | doc/source/devref/unit_tests.rst | 2 | ||||
| -rw-r--r-- | requirements.txt (renamed from tools/pip-requires) | 0 | ||||
| -rw-r--r-- | test-requirements.txt (renamed from tools/test-requires) | 0 | ||||
| -rw-r--r-- | tools/install_venv.py | 4 | ||||
| -rw-r--r-- | tools/patch_tox_venv.py | 4 | ||||
| -rw-r--r-- | tox.ini | 4 |
7 files changed, 8 insertions, 8 deletions
diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst index 8c6e03323..79c368d3a 100644 --- a/doc/source/devref/development.environment.rst +++ b/doc/source/devref/development.environment.rst @@ -123,7 +123,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 8033406f0..b6549bd00 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 index 7db3a2a0b..7db3a2a0b 100644 --- a/tools/pip-requires +++ b/requirements.txt diff --git a/tools/test-requires b/test-requirements.txt index 1bf372b69..1bf372b69 100644 --- a/tools/test-requires +++ b/test-requirements.txt diff --git a/tools/install_venv.py b/tools/install_venv.py index dbc7333ec..8d30676df 100644 --- 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 = 'Nova' 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 6ae6c2e7f..ebbf766bb 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 = 'nova' install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, @@ -7,8 +7,8 @@ setenv = VIRTUAL_ENV={envdir} LANG=en_US.UTF-8 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 python setup.py testr --slowest --testr-args='{posargs}' |