summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2015-05-12 15:38:41 +0200
committerholger krekel <holger@merlinux.eu>2015-05-12 15:38:41 +0200
commitf79185294a8b36d73e0380220499ca641ea4450f (patch)
treecd1532cf81654e7786884052072d35f3b61d62ab
parent63e565d660867ee8794d0e9d06f45240108910df (diff)
downloadtox-f79185294a8b36d73e0380220499ca641ea4450f.tar.gz
mark distshare ini variable as deprecated
-rw-r--r--CHANGELOG4
-rw-r--r--doc/config.txt6
2 files changed, 6 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0df3656..158a40f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,7 +17,7 @@
If platform is set and doesn't match the platform spec in the test
environment the test environment is ignored, no setup or tests are attempted.
-.. (new) add per-venv "ignore_errors" setting, which defaults to False.
+- (new) add per-venv "ignore_errors" setting, which defaults to False.
If ``True``, a non-zero exit code from one command will be ignored and
further commands will be executed (which was the default behavior in tox <
2.0). If ``False`` (the default), then a non-zero exit code from one command
@@ -51,6 +51,8 @@
- rename internal files -- tox offers no external API except for the
experimental plugin hooks, use tox internals at your own risk.
+- DEPRECATE distshare in documentation
+
1.9.2
diff --git a/doc/config.txt b/doc/config.txt
index 55f9c76..816c7bf 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -19,7 +19,7 @@ List of optional global options::
toxworkdir=path # tox working directory, defaults to {toxinidir}/.tox
setupdir=path # defaults to {toxinidir}
distdir=path # defaults to {toxworkdir}/dist
- distshare=path # defaults to {homedir}/.tox/distshare
+ distshare=path # (DEPRECATED) defaults to {homedir}/.tox/distshare
envlist=ENVLIST # defaults to the list of all environments
skipsdist=BOOL # defaults to false
@@ -30,7 +30,7 @@ and will first lookup global tox settings in this section::
[tox:jenkins]
... # override [tox] settings for the jenkins context
- # note: for jenkins distshare defaults to ``{toxworkdir}/distshare``.
+ # note: for jenkins distshare defaults to ``{toxworkdir}/distshare`` (DEPRECATED)
.. confval:: skip_missing_interpreters=BOOL
@@ -323,7 +323,7 @@ Globally available substitutions
the directory where sdist-packages will be created in
``{distshare}``
- the directory where sdist-packages will be copied to so that
+ (DEPRECATED) the directory where sdist-packages will be copied to so that
they may be accessed by other processes or tox runs.
substitutions for virtualenv-related sections