diff --git a/tox.ini b/tox.ini index 62b7b04c..7421c839 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,10 @@ [tox] envlist = py3,pep8,,py36-local,eslint,karma-local,docs-local,releasenotes,lower-constraints-local minversion = 2.3.2 -skipsdist = True +# Automatic envs (pyXX) will only use the python version appropriate to that +# env and ignore basepython inherited from [testenv] if we set +# ignore_basepython_conflict. +ignore_basepython_conflict = True [testenv] basepython = python3 @@ -46,7 +49,7 @@ commands = {[testenv]commands} [testenv:eslint] -whitelist_externals = +allowlist_externals = npm commands = npm install @@ -56,15 +59,15 @@ commands = # from master branch into py35 environment for testing javascripts. # Horizon from master is needed to be cloned into ../horizon on both local and CI. [testenv:karma] -whitelist_externals = - {[testenv:eslint]whitelist_externals} +allowlist_externals = + {[testenv:eslint]allowlist_externals} commands = npm install npm run test [testenv:karma-local] -whitelist_externals = - {[testenv:eslint]whitelist_externals} +allowlist_externals = + {[testenv:eslint]allowlist_externals} commands = {[testenv:karma]commands} @@ -92,7 +95,7 @@ commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:debug] -whitelist_externals = oslo_debug_helper +allowlist_externals = oslo_debug_helper commands = oslo_debug_helper -t senlin_dashboard/test {posargs} [testenv:makemessages]