Merge "tox: Change default 'install_command'"
This commit is contained in:
commit
73c5b0e985
22
tox.ini
22
tox.ini
|
@ -6,6 +6,7 @@ ignore_basepython_conflict = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
|
install_command = bash tools/pip.sh {opts} {packages}
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
OS_TEST_TIMEOUT=240
|
OS_TEST_TIMEOUT=240
|
||||||
OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:1}
|
OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:1}
|
||||||
|
@ -21,34 +22,23 @@ passenv = ZUUL_TEST_ROOT
|
||||||
ZUUL_MYSQL_HOST
|
ZUUL_MYSQL_HOST
|
||||||
ZUUL_POSTGRES_HOST
|
ZUUL_POSTGRES_HOST
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install {opts} {packages}
|
|
||||||
whitelist_externals = bash
|
whitelist_externals = bash
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = stestr run {posargs}
|
commands = stestr run {posargs}
|
||||||
stestr slowest
|
stestr slowest
|
||||||
|
|
||||||
[nodeenv]
|
|
||||||
install_command = bash tools/pip.sh {opts} {packages}
|
|
||||||
|
|
||||||
[testenv:py35]
|
|
||||||
install_command = {[nodeenv]install_command}
|
|
||||||
|
|
||||||
[testenv:py36]
|
|
||||||
install_command = {[nodeenv]install_command}
|
|
||||||
|
|
||||||
[testenv:py37]
|
|
||||||
install_command = {[nodeenv]install_command}
|
|
||||||
|
|
||||||
[testenv:bindep]
|
[testenv:bindep]
|
||||||
# Do not install any requirements. We want this to be fast and work even if
|
# Do not install any requirements. We want this to be fast and work even if
|
||||||
# system dependencies are missing, since it's used to tell you what system
|
# system dependencies are missing, since it's used to tell you what system
|
||||||
# dependencies are missing! This also means that bindep must be installed
|
# dependencies are missing! This also means that bindep must be installed
|
||||||
# separately, outside of the requirements files.
|
# separately, outside of the requirements files.
|
||||||
|
install_command = pip install {opts} {packages}
|
||||||
deps = bindep
|
deps = bindep
|
||||||
commands = bindep test
|
commands = bindep test
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
|
install_command = pip install {opts} {packages}
|
||||||
# --ignore-missing-imports tells mypy to not try to follow imported modules
|
# --ignore-missing-imports tells mypy to not try to follow imported modules
|
||||||
# out of the current tree. As you might expect, we don't want to run static
|
# out of the current tree. As you might expect, we don't want to run static
|
||||||
# type checking on the world - just on ourselves.
|
# type checking on the world - just on ourselves.
|
||||||
|
@ -57,7 +47,7 @@ commands =
|
||||||
mypy --ignore-missing-imports zuul
|
mypy --ignore-missing-imports zuul
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
install_command = {[nodeenv]install_command}
|
install_command = pip install {opts} {packages}
|
||||||
setenv =
|
setenv =
|
||||||
{[testenv]setenv}
|
{[testenv]setenv}
|
||||||
PYTHON=coverage run --source zuul --parallel-mode
|
PYTHON=coverage run --source zuul --parallel-mode
|
||||||
|
@ -68,22 +58,22 @@ commands =
|
||||||
coverage xml -o cover/coverage.xml
|
coverage xml -o cover/coverage.xml
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
|
install_command = pip install {opts} {packages}
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands =
|
commands =
|
||||||
sphinx-build -E -W -d doc/build/doctrees -b html doc/source/ doc/build/html
|
sphinx-build -E -W -d doc/build/doctrees -b html doc/source/ doc/build/html
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
|
install_command = pip install {opts} {packages}
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:nodepool]
|
[testenv:nodepool]
|
||||||
install_command = {[nodeenv]install_command}
|
|
||||||
commands = stestr run --concurrency=1 --test-path ./tests/nodepool {posargs}
|
commands = stestr run --concurrency=1 --test-path ./tests/nodepool {posargs}
|
||||||
|
|
||||||
[testenv:remote]
|
[testenv:remote]
|
||||||
commands = stestr run --test-path ./tests/remote {posargs}
|
commands = stestr run --test-path ./tests/remote {posargs}
|
||||||
passenv = ZUUL_TEST_ROOT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_LOG_DEFAULTS ZUUL_REMOTE_IPV4 ZUUL_SSH_KEY NODEPOOL_ZK_HOST
|
passenv = ZUUL_TEST_ROOT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_LOG_DEFAULTS ZUUL_REMOTE_IPV4 ZUUL_SSH_KEY NODEPOOL_ZK_HOST
|
||||||
install_command = {[nodeenv]install_command}
|
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
# These are ignored intentionally in openstack-infra projects;
|
# These are ignored intentionally in openstack-infra projects;
|
||||||
|
|
Loading…
Reference in New Issue