Skip to content

Commit 357901a

Browse files
committed
Revert "TST: Remove numpy cpu disabling from some subprocess tests"
This reverts commit d6f6875.
1 parent 85c6eb6 commit 357901a

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

lib/matplotlib/tests/test_backend_tk.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ def test_func():
3636
try:
3737
proc = subprocess.run(
3838
[sys.executable, "-c", f"{source}\n{func.__name__}()"],
39-
env={**os.environ, "MPLBACKEND": "TkAgg",
40-
"NPY_DISABLE_CPU_FEATURES": ""},
39+
env={**os.environ, "MPLBACKEND": "TkAgg"},
4140
timeout=_test_timeout,
4241
stdout=subprocess.PIPE,
4342
stderr=subprocess.PIPE,

lib/matplotlib/tests/test_sphinxext.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ def test_tinypages(tmpdir):
2828
# coverage anyways); hide them using GCOV_ERROR_FILE.
2929
proc = Popen(
3030
cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True,
31-
env={**os.environ, "MPLBACKEND": "", "GCOV_ERROR_FILE": os.devnull,
32-
"NPY_DISABLE_CPU_FEATURES": ""})
31+
env={**os.environ, "MPLBACKEND": "", "GCOV_ERROR_FILE": os.devnull})
3332
out, err = proc.communicate()
3433

3534
# Build the pages with warnings turned into errors
@@ -129,8 +128,7 @@ def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None):
129128
cmd = [sys.executable, '-msphinx', '-W', '-b', 'html',
130129
'-d', str(doctree_dir), str(source_dir), str(html_dir), *extra_args]
131130
proc = Popen(cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True,
132-
env={**os.environ, "MPLBACKEND": "",
133-
"NPY_DISABLE_CPU_FEATURES": ""})
131+
env={**os.environ, "MPLBACKEND": ""})
134132
out, err = proc.communicate()
135133

136134
assert proc.returncode == 0, \

0 commit comments

Comments
 (0)