From d88705e3996148c5b12f44bbbd4f568946d2ae71 Mon Sep 17 00:00:00 2001 From: Marius Gedminas Date: Mon, 8 Jul 2019 15:32:37 +0300 Subject: [PATCH] Move depends and parallel_show_output into the right section `depends` and `parallel_show_output` are not global settings, they're per-environment settings. I think they got listed in the global settings section by accident. --- docs/config.rst | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/config.rst b/docs/config.rst index 546bba18d..3e24c5cf4 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -160,25 +160,6 @@ Global settings are defined under the ``tox`` section as: Name of the virtual environment used to create a source distribution from the source tree. -.. conf:: parallel_show_output ^ bool ^ false - - .. versionadded:: 3.7.0 - - If set to True the content of the output will always be shown when running in parallel mode. - -.. conf:: depends ^ comma separated values - - .. versionadded:: 3.7.0 - - tox environments this depends on. tox will try to run all dependent environments before running this - environment. Format is same as :conf:`envlist` (allows factor usage). - - .. warning:: - - ``depends`` does not pull in dependencies into the run target, for example if you select ``py27,py36,coverage`` - via the ``-e`` tox will only run those three (even if ``coverage`` may specify as ``depends`` other targets too - - such as ``py27, py35, py36, py37``). - Jenkins override ++++++++++++++++ @@ -543,6 +524,25 @@ Complete list of settings that you can put into ``testenv*`` sections: the environment to the user upon listing environments for the command line with any level of verbosity higher than zero. +.. conf:: parallel_show_output ^ bool ^ false + + .. versionadded:: 3.7.0 + + If set to True the content of the output will always be shown when running in parallel mode. + +.. conf:: depends ^ comma separated values + + .. versionadded:: 3.7.0 + + tox environments this depends on. tox will try to run all dependent environments before running this + environment. Format is same as :conf:`envlist` (allows factor usage). + + .. warning:: + + ``depends`` does not pull in dependencies into the run target, for example if you select ``py27,py36,coverage`` + via the ``-e`` tox will only run those three (even if ``coverage`` may specify as ``depends`` other targets too - + such as ``py27, py35, py36, py37``). + Substitutions -------------