summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2015-05-12 23:02:11 +0200
committerholger krekel <holger@merlinux.eu>2015-05-12 23:02:11 +0200
commite016c31b467daf8efc9f5fd7e3b4b469cd6f7c94 (patch)
tree2be85b5bc252d1e6559d910f966ddc482a216312
parent486fe99bc56acbbb8078bd5aab8bafc9b1dc09a2 (diff)
downloadtox-e016c31b467daf8efc9f5fd7e3b4b469cd6f7c94.tar.gz
also pass PIP_INDEX_URL because it's likely that the user wants to use2.0.0
it with the pip commands that run inside the tox run.
-rw-r--r--CHANGELOG4
-rw-r--r--doc/announce/release-2.0.txt5
-rw-r--r--doc/config.txt5
-rw-r--r--tests/test_config.py1
-rw-r--r--tox/config.py2
5 files changed, 9 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1c14310..c0b7d59 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,10 +2,10 @@
-----------
- (new) introduce environment variable isolation:
- tox now only passes the PATH variable from the tox
+ tox now only passes the PATH and PIP_INDEX_URL variable from the tox
invocation environment to the test environment and on Windows
also ``SYSTEMROOT``, ``PATHEXT``, ``TEMP`` and ``TMP`` whereas
- on linux additionally ``TMPDIR`` is passed. If you need to pass
+ on unix additionally ``TMPDIR`` is passed. If you need to pass
through further environment variables you can use the new ``passenv`` setting,
a space-separated list of environment variable names. Each name
can make use of fnmatch-style glob patterns. All environment
diff --git a/doc/announce/release-2.0.txt b/doc/announce/release-2.0.txt
index d21a12b..d2caf0c 100644
--- a/doc/announce/release-2.0.txt
+++ b/doc/announce/release-2.0.txt
@@ -55,10 +55,10 @@ Holger Krekel, merlinux GmbH
-----------
- (new) introduce environment variable isolation:
- tox now only passes the PATH variable from the tox
+ tox now only passes the PATH and PIP_INDEX_URL variable from the tox
invocation environment to the test environment and on Windows
also ``SYSTEMROOT``, ``PATHEXT``, ``TEMP`` and ``TMP`` whereas
- on linux additionally ``TMPDIR`` is passed. If you need to pass
+ on unix additionally ``TMPDIR`` is passed. If you need to pass
through further environment variables you can use the new ``passenv`` setting,
a space-separated list of environment variable names. Each name
can make use of fnmatch-style glob patterns. All environment
@@ -109,4 +109,3 @@ Holger Krekel, merlinux GmbH
experimental plugin hooks, use tox internals at your own risk.
- DEPRECATE distshare in documentation
-
diff --git a/doc/config.txt b/doc/config.txt
index 816c7bf..5a335f9 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -199,8 +199,9 @@ Complete list of settings that you can put into ``testenv*`` sections:
invocation environment it is ignored. You can use ``*`` and ``?`` to
match multiple environment variables with one name.
- Note that the ``PATH`` variable is unconditionally passed down and on
- Windows ``SYSTEMROOT`` and ``PATHEXT`` will be passed down as well.
+ Note that the ``PATH`` and ``PIP_INDEX_URL`` variables are unconditionally
+ passed down and on Windows ``SYSTEMROOT``, ``PATHEXT``, ``TEMP`` and ``TMP``
+ will be passed down as well whereas on unix ``TMPDIR`` will be passed down.
You can override these variables with the ``setenv`` option.
.. confval:: recreate=True|False(default)
diff --git a/tests/test_config.py b/tests/test_config.py
index a3824a6..526a795 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -715,6 +715,7 @@ class TestConfigTestEnv:
else:
assert "TMPDIR" in envconfig.passenv
assert "PATH" in envconfig.passenv
+ assert "PIP_INDEX_URL" in envconfig.passenv
assert "A123A" in envconfig.passenv
assert "A123B" in envconfig.passenv
diff --git a/tox/config.py b/tox/config.py
index de45138..5963f13 100644
--- a/tox/config.py
+++ b/tox/config.py
@@ -387,7 +387,7 @@ def tox_addoption(parser):
help="list of X=Y lines with environment variable settings")
def passenv(testenv_config, value):
- passenv = set(["PATH"])
+ passenv = set(["PATH", "PIP_INDEX_URL"])
# we ensure that tmp directory settings are passed on
# we could also set it to the per-venv "envtmpdir"