diff options
author | holger krekel <holger@merlinux.eu> | 2015-11-11 14:17:20 +0100 |
---|---|---|
committer | holger krekel <holger@merlinux.eu> | 2015-11-11 14:17:20 +0100 |
commit | 10e32b67c84ab0d66115b8850432818257023d21 (patch) | |
tree | a8da2a34537635e9083f71e074def8ef0ca3a9a4 | |
parent | 9cb990897f4dac7c48e90d0a9215334560ced9ef (diff) | |
download | tox-10e32b67c84ab0d66115b8850432818257023d21.tar.gz |
doc ignore_outcome and bump doc version2.2.0
-rw-r--r-- | doc/conf.py | 4 | ||||
-rw-r--r-- | doc/config.txt | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/doc/conf.py b/doc/conf.py index 630cb80..79857d7 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -48,8 +48,8 @@ copyright = u'2015, holger krekel and others' # built documents. # # The short X.Y version. -release = "2.1" -version = "2.1.0" +release = "2.2" +version = "2.2.0" # The full version, including alpha/beta/rc tags. # The language for content autogenerated by Sphinx. Refer to documentation diff --git a/doc/config.txt b/doc/config.txt index ed9290c..8bfa57d 100644 --- a/doc/config.txt +++ b/doc/config.txt @@ -302,6 +302,15 @@ Complete list of settings that you can put into ``testenv*`` sections: **default**: ``False`` +.. confval:: ignore_outcome=BOOL + + .. versionadded:: 2.2 + + If set to True a failing result of this testenv will not make tox fail, + only a warning will be produced. + + **default**: ``False`` + Substitutions ------------- |