Adjust tox.ini for tox4
OpenStack CI now uses tox4 by default. - Drop "skipsdist = True". When skipsdist=True is specified, a target application is not installed into a tox env, but there seems no reason to do so. In various other OpenStack projects, a target applicatin needs to be installed into a tox vnev, for example, in docs and/or linter jobs and it causes failures with tox4. So dropping it would avoid potential future failures. - Add ignore_basepython_conflict = True to tox.ini With latest tox (>4.0.15) python version conflicted with base python. Adding ignore_basepython_conflict = True solves this issue. - Replace deprecated whitelist_externals with allowlist_externals. Change-Id: Iead95c0779f9705cf096d1ac3038a16aa62f1678
This commit is contained in:
parent
834286c79b
commit
faf9bf4514
17
tox.ini
17
tox.ini
@ -1,7 +1,10 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = py3,pep8,,py36-local,eslint,karma-local,docs-local,releasenotes,lower-constraints-local
|
envlist = py3,pep8,,py36-local,eslint,karma-local,docs-local,releasenotes,lower-constraints-local
|
||||||
minversion = 2.3.2
|
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]
|
[testenv]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
@ -46,7 +49,7 @@ commands =
|
|||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
|
|
||||||
[testenv:eslint]
|
[testenv:eslint]
|
||||||
whitelist_externals =
|
allowlist_externals =
|
||||||
npm
|
npm
|
||||||
commands =
|
commands =
|
||||||
npm install
|
npm install
|
||||||
@ -56,15 +59,15 @@ commands =
|
|||||||
# from master branch into py35 environment for testing javascripts.
|
# from master branch into py35 environment for testing javascripts.
|
||||||
# Horizon from master is needed to be cloned into ../horizon on both local and CI.
|
# Horizon from master is needed to be cloned into ../horizon on both local and CI.
|
||||||
[testenv:karma]
|
[testenv:karma]
|
||||||
whitelist_externals =
|
allowlist_externals =
|
||||||
{[testenv:eslint]whitelist_externals}
|
{[testenv:eslint]allowlist_externals}
|
||||||
commands =
|
commands =
|
||||||
npm install
|
npm install
|
||||||
npm run test
|
npm run test
|
||||||
|
|
||||||
[testenv:karma-local]
|
[testenv:karma-local]
|
||||||
whitelist_externals =
|
allowlist_externals =
|
||||||
{[testenv:eslint]whitelist_externals}
|
{[testenv:eslint]allowlist_externals}
|
||||||
commands =
|
commands =
|
||||||
{[testenv:karma]commands}
|
{[testenv:karma]commands}
|
||||||
|
|
||||||
@ -92,7 +95,7 @@ commands =
|
|||||||
sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||||
|
|
||||||
[testenv:debug]
|
[testenv:debug]
|
||||||
whitelist_externals = oslo_debug_helper
|
allowlist_externals = oslo_debug_helper
|
||||||
commands = oslo_debug_helper -t senlin_dashboard/test {posargs}
|
commands = oslo_debug_helper -t senlin_dashboard/test {posargs}
|
||||||
|
|
||||||
[testenv:makemessages]
|
[testenv:makemessages]
|
||||||
|
Loading…
Reference in New Issue
Block a user