summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorCyril Roelandt <cyril@redhat.com>2022-12-16 04:56:02 +0100
committerCyril Roelandt <cyril@redhat.com>2023-01-12 14:05:25 +0100
commit6c95122777c8449056115292b492ec3e1e0d6e50 (patch)
tree2f6733b2ee43e1031c68bc7db2953f10fd1d4d8b /tox.ini
parent0bd9f80c6791ec7842f124295a76b00cf781c767 (diff)
downloadpython-glanceclient-6c95122777c8449056115292b492ec3e1e0d6e50.tar.gz
Fix functional tests and docs generation
First, fix test_help(). A commit[1], which first appeared in Python 3.10, changes the output of the help feature of argparse. Options used to be in a section named "Optional arguments:", and they are now in a section named "Options:". Second, tox 4 changes the behaviour of tox, and {toxinidir}/requirements.txt is no longer installed automagically in the docs virtual environment. This causes autodoc to fail on some imports. We explicitely add {toxinidir}/requirements.txt to the list of dependencies to fix this issue. These issues should be fixed in separate patches, but since they both block the CI, they depend on each other. [1] https://github.com/python/cpython/pull/23858 Change-Id: Ia7866390b31f469bdea95624325a13aaf45a496e Closes-Bug: #2002566
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini4
1 files changed, 3 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 981ea8f..f516070 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,7 +54,9 @@ commands =
[testenv:docs]
basepython = python3
-deps = -r{toxinidir}/doc/requirements.txt
+deps =
+ -r{toxinidir}/requirements.txt
+ -r{toxinidir}/doc/requirements.txt
commands =
sphinx-build -W -b html doc/source doc/build/html
sphinx-build -W -b man doc/source doc/build/man