From 8894ee9bd3d7dcf34a29e366940e1cb0c2871df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= Date: Thu, 8 Dec 2022 09:06:40 -0800 Subject: [PATCH] Pass through NUMBER_OF_PROCESSORS on Windows (#2647) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- docs/changelog/2629.bugfix.rst | 2 ++ src/tox/tox_env/python/api.py | 1 + tests/session/cmd/test_show_config.py | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 docs/changelog/2629.bugfix.rst diff --git a/docs/changelog/2629.bugfix.rst b/docs/changelog/2629.bugfix.rst new file mode 100644 index 000000000..24987141a --- /dev/null +++ b/docs/changelog/2629.bugfix.rst @@ -0,0 +1,2 @@ +Pass through ``NUMBER_OF_PROCESSORS`` on Windows as is needed for ``multiprocessing.cpu_count`` - +by :user:`gaborbernat`. diff --git a/src/tox/tox_env/python/api.py b/src/tox/tox_env/python/api.py index 8be79088e..b55068b42 100644 --- a/src/tox/tox_env/python/api.py +++ b/src/tox/tox_env/python/api.py @@ -94,6 +94,7 @@ def _default_pass_env(self) -> list[str]: "SYSTEMROOT", # needed for python's crypto module "COMSPEC", # needed for distutils cygwin compiler "PROCESSOR_ARCHITECTURE", # platform.machine() + "NUMBER_OF_PROCESSORS", # multiprocessing.cpu_count() ], ) env.extend(["REQUESTS_CA_BUNDLE"]) diff --git a/tests/session/cmd/test_show_config.py b/tests/session/cmd/test_show_config.py index 0b3006f75..7e6c1cff4 100644 --- a/tests/session/cmd/test_show_config.py +++ b/tests/session/cmd/test_show_config.py @@ -100,7 +100,7 @@ def test_pass_env_config_default(tox_project: ToxProjectCreator, stdout_is_atty: expected = ( (["COMSPEC"] if is_win else []) + ["CURL_CA_BUNDLE", "LANG", "LANGUAGE", "LD_LIBRARY_PATH"] - + (["MSYSTEM", "PATHEXT"] if is_win else []) + + (["MSYSTEM", "NUMBER_OF_PROCESSORS", "PATHEXT"] if is_win else []) + ["PIP_*"] + (["PROCESSOR_ARCHITECTURE"] if is_win else []) + (["PROGRAMDATA"] if is_win else [])