deprecate indexserver options2.3.0

2 files changed, 11 insertions, 8 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4da6d0f..695300e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 2.3.0 (unreleased)
 -----
 
+- DEPRECATE use of "indexservers" in tox.ini.  It complicates
+  the internal code and it is recommended to rather use the
+  devpi system for managing indexes for pip.
+
 - fix issue285: make setenv processing fully lazy to fix regressions
   of tox-2.2.X and so that we can now have testenv attributes like 
   "basepython" depend on environment variables that are set in 
@@ -20,8 +24,8 @@
   tox_testenv_install_deps(venv, action) hooks to allow
   plugins to do additional work on creation or installing
   deps.  These hooks are experimental mainly because of
-  the involved "venv" object whose current public API is not 
-  fully guranteed.
+  the involved "venv" and session objects whose current public 
+  API is not fully guranteed.
 
 - internal: push some optional object creation into tests because
   tox core doesn't need it.
diff --git a/doc/config.txt b/doc/config.txt
index 22f3dc7..205b22a 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -93,9 +93,6 @@ Complete list of settings that you can put into ``testenv*`` sections:
 
     .. versionadded:: 1.6
 
-    **WARNING**: This setting is **EXPERIMENTAL** so use with care
-    and be ready to adapt your tox.ini's with post-1.6 tox releases.
-
     the ``install_command`` setting is used for installing packages into
     the virtual environment; both the package under test
     and any defined dependencies. Must contain the substitution key
@@ -166,7 +163,8 @@ Complete list of settings that you can put into ``testenv*`` sections:
     package installation.  Each line defines a dependency, which will be
     passed to the installer command for processing.  Each line specifies a file,
     a URL or a package name.  You can additionally specify
-    an :confval:`indexserver` to use for installing this dependency.
+    an :confval:`indexserver` to use for installing this dependency
+    but this functionality is deprecated since tox-2.3.
     All derived dependencies (deps required by the dep) will then be
     retrieved from the specified indexserver::
 
@@ -259,8 +257,9 @@ Complete list of settings that you can put into ``testenv*`` sections:
 
    .. versionadded:: 0.9
 
-   Multi-line ``name = URL`` definitions of python package servers.
-   Dependencies can specify using a specified index server through the
+   (DEPRECATED, will be removed in a future version) Multi-line ``name =
+   URL`` definitions of python package servers.  Dependencies can
+   specify using a specified index server through the
    ``:indexservername:depname`` pattern.  The ``default`` indexserver
    definition determines where unscoped dependencies and the sdist install
    installs from.  Example::