From 18cabd0b8ee1733f5d4d185d11585ebcbf693cb4 Mon Sep 17 00:00:00 2001 From: George Alton Date: Fri, 17 Apr 2020 23:39:08 +0100 Subject: [PATCH 1/2] passes PIP_EXTRA_INDEX_URL environment variable --- CONTRIBUTORS | 1 + docs/changelog/1561.feature.rst | 1 + docs/config.rst | 2 +- src/tox/config/__init__.py | 1 + tests/unit/config/test_config.py | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 docs/changelog/1561.feature.rst diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 97f847f01..13a714812 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -29,6 +29,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 new file mode 100644 index 000000000..3a061a5b0 --- /dev/null +++ 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 index c159a5086..ee131e741 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -402,7 +402,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 index b33dbc39a..44ab35766 100644 --- 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 index ba21a25b3..681d2eb7e 100644 --- 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 From 5996fca65b886d88033ac3b0c31e955f897235a7 Mon Sep 17 00:00:00 2001 From: George Alton Date: Sat, 18 Apr 2020 12:07:35 +0100 Subject: [PATCH 2/2] fixes typo --- CONTRIBUTING.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 7c9d371ab..b23fa99d7 100644 --- 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