Passenv PIP_EXTRA_INDEX_URL by default (tox-dev#1562)

ssbarnea · Apr 19, 2021 · 637aa66 · 637aa66
1 parent 71961e1
commit 637aa66
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 2 deletions.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -168,7 +168,7 @@ Here is a simple overview, with tox-specific bits:
 
     $ tox -e dev
 
-   To get information about all environements, type:
+   To get information about all environments, type:
 
    $ tox -av
 

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -30,6 +30,7 @@ Eugene Yunak
 Fernando L. Pereira
 Florian Preinstorfer
 Florian Schulze
+George Alton
 Gonéri Le Bouder
 Hazal Ozturk
 Henk-Jaap Wagenaar

diff --git a/docs/changelog/1561.feature.rst b/docs/changelog/1561.feature.rst
@@ -0,0 +1 @@
+default to passing the env var PIP_EXTRA_INDEX_URL by :user:`georgealton`.
diff --git a/docs/config.rst b/docs/config.rst
@@ -429,7 +429,7 @@ Complete list of settings that you can put into ``testenv*`` sections:
 
     * passed through on all platforms: ``CURL_CA_BUNDLE``, ``PATH``,
       ``LANG``, ``LANGUAGE``,
-      ``LD_LIBRARY_PATH``, ``PIP_INDEX_URL``,
+      ``LD_LIBRARY_PATH``, ``PIP_INDEX_URL``, ``PIP_EXTRA_INDEX_URL``,
       ``REQUESTS_CA_BUNDLE``, ``SSL_CERT_FILE``,
       ``HTTP_PROXY``, ``HTTPS_PROXY``, ``NO_PROXY``
     * Windows: ``SYSTEMDRIVE``, ``SYSTEMROOT``, ``PATHEXT``, ``TEMP``, ``TMP``

diff --git a/src/tox/config/__init__.py b/src/tox/config/__init__.py
@@ -688,6 +688,7 @@ def passenv(testenv_config, value):
             "LD_LIBRARY_PATH",
             "PATH",
             "PIP_INDEX_URL",
+            "PIP_EXTRA_INDEX_URL",
             "REQUESTS_CA_BUNDLE",
             "SSL_CERT_FILE",
             "TOX_WORK_DIR",

diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
@@ -1100,6 +1100,7 @@ def test_passenv_as_multiline_list(self, newconfig, monkeypatch, plat):
         assert "CURL_CA_BUNDLE" in envconfig.passenv
         assert "PATH" in envconfig.passenv
         assert "PIP_INDEX_URL" in envconfig.passenv
+        assert "PIP_EXTRA_INDEX_URL" in envconfig.passenv
         assert "REQUESTS_CA_BUNDLE" in envconfig.passenv
         assert "SSL_CERT_FILE" in envconfig.passenv
         assert "LANG" in envconfig.passenv
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		default to passing the env var PIP_EXTRA_INDEX_URL by :user:`georgealton`.