Renames 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: Iac3c680dd19cabd8ea38598a6e2bb27238030a2d Fixes: bug #1179008
This commit is contained in:
parent
4b9cd0040d
commit
5b24518b10
@ -15,7 +15,7 @@ include tox.ini
|
||||
include bin/less/lessc
|
||||
include doc/Makefile
|
||||
include doc/source/_templates/.placeholder
|
||||
include tools/pip-requires
|
||||
include tools/test-requires
|
||||
include requirements.txt
|
||||
include test-requirements.txt
|
||||
|
||||
exclude openstack_dashboard/local/local_settings.py
|
||||
|
@ -90,7 +90,7 @@ For development, start with the getting started instructions above.
|
||||
Once you have a working virtualenv and all the necessary packages, read on.
|
||||
|
||||
If dependencies are added to either ``horizon`` or ``openstack-dashboard``,
|
||||
they should be added to ``tools/pip-requires``.
|
||||
they should be added to ``requirements.txt``.
|
||||
|
||||
The ``run_tests.sh`` script invokes tests and analyses on both of these
|
||||
components in its process, and it is what Jenkins uses to verify the
|
||||
|
@ -74,7 +74,7 @@ built with the ``tools/install_venv.py`` script. That script creates a
|
||||
virtualenv and installs all the necessary packages.
|
||||
|
||||
If dependencies are added to either ``horizon`` or ``openstack_dashboard``,
|
||||
they should be added to ``tools/pip-requires``.
|
||||
they should be added to ``requirements.txt``.
|
||||
|
||||
.. important::
|
||||
|
||||
|
@ -6,7 +6,7 @@ set -o errexit
|
||||
# Increment me any time the environment should be rebuilt.
|
||||
# This includes dependncy changes, directory renames, etc.
|
||||
# Simple integer secuence: 1, 2, 3...
|
||||
environment_version=34
|
||||
environment_version=35
|
||||
#--------------------------------------------------------#
|
||||
|
||||
function usage {
|
||||
|
@ -32,8 +32,8 @@ import sys
|
||||
ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
||||
VENV = os.path.join(ROOT, '.venv')
|
||||
WITH_VENV = os.path.join(ROOT, 'tools', 'with_venv.sh')
|
||||
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')
|
||||
|
||||
|
||||
def die(message, *args):
|
||||
|
4
tox.ini
4
tox.ini
@ -8,8 +8,8 @@ setenv = VIRTUAL_ENV={envdir}
|
||||
NOSE_OPENSTACK_RED=0.05
|
||||
NOSE_OPENSTACK_YELLOW=0.025
|
||||
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
||||
deps = -r{toxinidir}/tools/pip-requires
|
||||
-r{toxinidir}/tools/test-requires
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = /bin/bash run_tests.sh -N
|
||||
|
||||
[testenv:pep8]
|
||||
|
Loading…
Reference in New Issue
Block a user