diff options
| author | Anthony Sottile <asottile@umich.edu> | 2018-01-13 17:09:42 -0800 |
|---|---|---|
| committer | Gábor Bernát <gaborjbernat@gmail.com> | 2018-01-14 01:09:42 +0000 |
| commit | 1f3b86f460aab9ba565ab0060eb1e2453cccee51 (patch) | |
| tree | 6cb3b433537645346927b96eda2fa9a0af7e2ec8 | |
| parent | 36ff71d18d10e3c0d4275179d8912abc385b20f0 (diff) | |
| download | tox-git-1f3b86f460aab9ba565ab0060eb1e2453cccee51.tar.gz | |
passenv PROCESSOR_ARCHITECTURE by default on windows (#742)
| -rw-r--r-- | changelog/740.feature.rst | 2 | ||||
| -rw-r--r-- | tests/test_config.py | 1 | ||||
| -rwxr-xr-x | tox/config.py | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/changelog/740.feature.rst b/changelog/740.feature.rst new file mode 100644 index 00000000..236efbd8 --- /dev/null +++ b/changelog/740.feature.rst @@ -0,0 +1,2 @@ +Forward ``PROCESSOR_ARCHITECTURE`` by default on Windows to fix +``platform.machine()``. diff --git a/tests/test_config.py b/tests/test_config.py index e8e8d559..1f446caa 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -908,6 +908,7 @@ class TestConfigTestEnv: assert "TEMP" in envconfig.passenv assert "TMP" in envconfig.passenv assert "NUMBER_OF_PROCESSORS" in envconfig.passenv + assert "PROCESSOR_ARCHITECTURE" in envconfig.passenv assert "USERPROFILE" in envconfig.passenv assert "MSYSTEM" in envconfig.passenv else: diff --git a/tox/config.py b/tox/config.py index d03c97e0..ec9dc6c2 100755 --- a/tox/config.py +++ b/tox/config.py @@ -530,6 +530,7 @@ def tox_addoption(parser): # for `multiprocessing.cpu_count()` on Windows # (prior to Python 3.4). passenv.add("NUMBER_OF_PROCESSORS") + passenv.add("PROCESSOR_ARCHITECTURE") # platform.machine() passenv.add("USERPROFILE") # needed for `os.path.expanduser()` passenv.add("MSYSTEM") # fixes #429 else: |