From ebbdb3f1dc0c227261cfefd0d74bf5f3f7e64a03 Mon Sep 17 00:00:00 2001 From: Niander Assis <4544122+niander@users.noreply.github.com> Date: Tue, 19 Apr 2022 13:31:16 -0700 Subject: [PATCH 1/3] adding APPDATA to passenv in win --- src/tox/config/__init__.py | 1 + tests/unit/config/test_config.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/tox/config/__init__.py b/src/tox/config/__init__.py index b49c06f6d..24f669d37 100644 --- a/src/tox/config/__init__.py +++ b/src/tox/config/__init__.py @@ -796,6 +796,7 @@ def passenv(testenv_config, value): # but this leads to very long paths when run with jenkins # so we just pass it on by default for now. if tox.INFO.IS_WIN: + passenv.add("APPDATA") # needed to find user site-packages location passenv.add("SYSTEMDRIVE") # needed for pip6 passenv.add("SYSTEMROOT") # needed for python's crypto module passenv.add("PATHEXT") # needed for discovering executables diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py index 3408de02a..b1a72b44c 100644 --- a/tests/unit/config/test_config.py +++ b/tests/unit/config/test_config.py @@ -1508,6 +1508,7 @@ def test_passenv_as_multiline_list(self, newconfig, monkeypatch, plat): assert len(config.envconfigs) == 1 envconfig = config.envconfigs["python"] if plat == "win32": + assert "APPDATA" in envconfig.passenv assert "PATHEXT" in envconfig.passenv assert "SYSTEMDRIVE" in envconfig.passenv assert "SYSTEMROOT" in envconfig.passenv @@ -1560,6 +1561,7 @@ def test_passenv_as_space_separated_list(self, newconfig, monkeypatch, plat): assert len(config.envconfigs) == 1 envconfig = config.envconfigs["python"] if plat == "win32": + assert "APPDATA" in envconfig.passenv assert "PATHEXT" in envconfig.passenv assert "SYSTEMDRIVE" in envconfig.passenv assert "SYSTEMROOT" in envconfig.passenv From 3a42d50038672991f242657912e16663a37ddebf Mon Sep 17 00:00:00 2001 From: Niander Assis <4544122+niander@users.noreply.github.com> Date: Tue, 19 Apr 2022 14:12:39 -0700 Subject: [PATCH 2/3] updating docs, changelog and contributors --- CONTRIBUTORS | 1 + docs/changelog/2402.bugfix.rst | 1 + docs/config.rst | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 docs/changelog/2402.bugfix.rst diff --git a/CONTRIBUTORS b/CONTRIBUTORS index f12b86f2c..feb454c9f 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -92,6 +92,7 @@ Miro Hrončok Monty Taylor Morgan Fainberg Naveen S R +Niander Assis Nick Douma Nick Prendergast Nicolas Vivet diff --git a/docs/changelog/2402.bugfix.rst b/docs/changelog/2402.bugfix.rst new file mode 100644 index 000000000..0b322933d --- /dev/null +++ b/docs/changelog/2402.bugfix.rst @@ -0,0 +1 @@ +``sitepackages = true`` will add user's site-package to the python path on Windows as expected -- by :user:`niander` \ No newline at end of file diff --git a/docs/config.rst b/docs/config.rst index 2ca82e3a8..67bdb66b8 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -468,7 +468,7 @@ Complete list of settings that you can put into ``testenv*`` sections: ``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`` + * Windows: ``APPDATA``, ``SYSTEMDRIVE``, ``SYSTEMROOT``, ``PATHEXT``, ``TEMP``, ``TMP`` ``NUMBER_OF_PROCESSORS``, ``USERPROFILE``, ``MSYSTEM``, ``PROGRAMFILES``, ``PROGRAMFILES(X86)``, ``PROGRAMDATA`` * Others (e.g. UNIX, macOS): ``TMPDIR`` From 3cd552c5356b9be6f5d591353618d296d446a1ef Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 21:16:51 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/changelog/2402.bugfix.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog/2402.bugfix.rst b/docs/changelog/2402.bugfix.rst index 0b322933d..25f5d724e 100644 --- a/docs/changelog/2402.bugfix.rst +++ b/docs/changelog/2402.bugfix.rst @@ -1 +1 @@ -``sitepackages = true`` will add user's site-package to the python path on Windows as expected -- by :user:`niander` \ No newline at end of file +``sitepackages = true`` will add user's site-package to the python path on Windows as expected -- by :user:`niander`