diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | docs/changelog/1498.feature.rst | 1 | ||||
| -rw-r--r-- | docs/config.rst | 3 | ||||
| -rw-r--r-- | src/tox/config/__init__.py | 3 | ||||
| -rw-r--r-- | tests/unit/config/test_config.py | 3 |
5 files changed, 10 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 5701b5b1..043b4d23 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -68,6 +68,7 @@ Nick Douma Nick Prendergast Oliver Bestwalter Pablo Galindo +Paul Moore Paweł Adamczak Philip Thiem Pierre-Jean Campigotto diff --git a/docs/changelog/1498.feature.rst b/docs/changelog/1498.feature.rst new file mode 100644 index 00000000..4e5d8f1e --- /dev/null +++ b/docs/changelog/1498.feature.rst @@ -0,0 +1 @@ +Add ``HTTP_PROXY``, ``HTTPS_PROXY`` and ``NO_PROXY`` to default passenv. - by :user:`pfmoore` diff --git a/docs/config.rst b/docs/config.rst index 89b7dc73..a2c73f73 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -403,7 +403,8 @@ 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``, - ``REQUESTS_CA_BUNDLE``, ``SSL_CERT_FILE`` + ``REQUESTS_CA_BUNDLE``, ``SSL_CERT_FILE``, + ``HTTP_PROXY``, ``HTTPS_PROXY``,``NO_PROXY`` * Windows: ``SYSTEMDRIVE``, ``SYSTEMROOT``, ``PATHEXT``, ``TEMP``, ``TMP`` ``NUMBER_OF_PROCESSORS``, ``USERPROFILE``, ``MSYSTEM`` * Others (e.g. UNIX, macOS): ``TMPDIR`` diff --git a/src/tox/config/__init__.py b/src/tox/config/__init__.py index 3b612676..c159ac33 100644 --- a/src/tox/config/__init__.py +++ b/src/tox/config/__init__.py @@ -676,6 +676,9 @@ def tox_addoption(parser): "REQUESTS_CA_BUNDLE", "SSL_CERT_FILE", "TOX_WORK_DIR", + "HTTP_PROXY", + "HTTPS_PROXY", + "NO_PROXY", str(REPORTER_TIMESTAMP_ON_ENV), str(PARALLEL_ENV_VAR_KEY_PUBLIC), } diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py index a717b8c3..56e849e6 100644 --- a/tests/unit/config/test_config.py +++ b/tests/unit/config/test_config.py @@ -1096,6 +1096,9 @@ class TestConfigTestEnv: assert "LANG" in envconfig.passenv assert "LANGUAGE" in envconfig.passenv assert "LD_LIBRARY_PATH" in envconfig.passenv + assert "HTTP_PROXY" in envconfig.passenv + assert "HTTPS_PROXY" in envconfig.passenv + assert "NO_PROXY" in envconfig.passenv assert PARALLEL_ENV_VAR_KEY_PUBLIC in envconfig.passenv assert PARALLEL_ENV_VAR_KEY_PRIVATE not in envconfig.passenv assert "A123A" in envconfig.passenv |