Merge "Clean up tox.ini"

This commit is contained in:
Zuul 2018-04-24 23:31:54 +00:00 committed by Gerrit Code Review
commit 1598d02e62
1 changed files with 6 additions and 36 deletions

42
tox.ini
View File

@ -5,66 +5,36 @@ skipsdist = True
[testenv] [testenv]
usedevelop = True usedevelop = True
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} install_command = pip install {opts} {packages}
setenv = setenv =
PYTHONUNBUFFERED=1 PYTHONUNBUFFERED=1
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
OS_TEST_PATH=tests/unit OS_TEST_PATH=tests/unit
deps = -r{toxinidir}/requirements.txt deps =
-r{toxinidir}/test-requirements.txt -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
psutil==3.0.1 -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
psutil==3.0.1
whitelist_externals = bash whitelist_externals = bash
find find
commands = commands =
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
[testenv:py27]
basepython = python2.7
setenv = {[testenv]setenv}
OS_TEST_PATH=tests/unit
whitelist_externals =
{[testenv]whitelist_externals}
deps =
{[testenv]deps}
commands =
ostestr {posargs}
[testenv:py35]
basepython = python3.5
setenv = {[testenv]setenv}
OS_TEST_PATH=tests/unit
whitelist_externals =
{[testenv]whitelist_externals}
deps =
{[testenv]deps}
commands =
ostestr {posargs} ostestr {posargs}
[testenv:functional] [testenv:functional]
basepython = python2.7 basepython = python2.7
install_command = {[testenv]install_command}
setenv = {[testenv]setenv} setenv = {[testenv]setenv}
SPARK_HOME=/opt/spark/current SPARK_HOME=/opt/spark/current
SPARK_SCALA_VERSION=2.10 SPARK_SCALA_VERSION=2.10
OS_TEST_PATH=tests/functional OS_TEST_PATH=tests/functional
whitelist_externals =
{[testenv]whitelist_externals}
deps =
{[testenv]deps}
commands = commands =
ostestr --serial {posargs} ostestr --serial {posargs}
[testenv:functional-py35] [testenv:functional-py35]
basepython = python3.5 basepython = python3.5
install_command = {[testenv]install_command}
setenv = {[testenv]setenv} setenv = {[testenv]setenv}
SPARK_HOME=/opt/spark/current SPARK_HOME=/opt/spark/current
OS_TEST_PATH=tests/functional OS_TEST_PATH=tests/functional
whitelist_externals =
{[testenv]whitelist_externals}
deps =
{[testenv]deps}
commands = commands =
ostestr --serial {posargs} ostestr --serial {posargs}