From 0c29d457a8175f5f54aa68ee71e581a4616b7c80 Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Mon, 2 Jan 2023 16:11:24 +0100 Subject: [PATCH] Changes needed for full functionality of tox 4.0.0 runtime Closes-Bug: #2000867 Signed-off-by: Jiri Podivin Change-Id: Ib9e3d5c1a8bde890f915cf28baf58695a008abc9 --- doc/source/conf.py | 2 +- tox.ini | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 014875c1..d3b20a72 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -69,7 +69,7 @@ openstackdocs_bug_tag = 'documentation' # autodoc generation is a bit aggressive and a nuisance when doing heavy # text edit cycles. # execute "export SPHINX_DEBUG=1" in your terminal to disable -autodoc_mock_imports = ['oslotest', 'ansible'] +autodoc_mock_imports = ['oslotest', 'ansible', 'ansible_runner'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] diff --git a/tox.ini b/tox.ini index 165b7caf..45e913e8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -minversion = 3.2.0 +minversion = 4.0.0 envlist = linters,docs,py3 skipsdist = True @@ -29,7 +29,7 @@ deps = -r {toxinidir}/requirements.txt -r {toxinidir}/test-requirements.txt -r {toxinidir}/doc/requirements.txt -whitelist_externals = bash +allowlist_externals = bash basepython = python3.10 [testenv:bindep] @@ -96,11 +96,12 @@ deps = -r {toxinidir}/test-requirements.txt -r {toxinidir}/doc/requirements.txt commands= + pip install {toxinidir} sphinx-build -a -E -W -d doc/build/doctrees --keep-going -b html doc/source doc/build/html -T doc8 doc [testenv:pdf-docs] -whitelist_externals = make +allowlist_externals = make description = Build PDF documentation. envdir = {toxworkdir}/docs