Skip to content

Commit d3d0bf5

Browse files
Backport PR #13082 on branch maint/1.9 (BUG: Fix bug with Mesa 3D detection) (#13084)
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
1 parent d596b6d commit d3d0bf5

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

doc/changes/devel/13082.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix bug with automated Mesa 3D detection for proper 3D option setting on systems with software rendering, by `Eric Larson`_.

examples/preprocessing/movement_detection.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
##############################################################################
8282
# After checking the annotated movement artifacts, calculate the new transform
8383
# and plot it:
84+
8485
new_dev_head_t = compute_average_dev_head_t(raw, head_pos)
8586
raw.info["dev_head_t"] = new_dev_head_t
8687
fig = mne.viz.plot_alignment(

mne/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ def pytest_configure(config):
172172
# pandas
173173
ignore:\n*Pyarrow will become a required dependency of pandas.*:DeprecationWarning
174174
ignore:np\.find_common_type is deprecated.*:DeprecationWarning
175+
ignore:Python binding for RankQuantileOptions.*:
175176
# pyvista <-> NumPy 2.0
176177
ignore:__array_wrap__ must accept context and return_scalar arguments.*:DeprecationWarning
177178
# nibabel <-> NumPy 2.0

mne/viz/_brain/tests/test_brain.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -773,9 +773,6 @@ def test_single_hemi(hemi, renderer_interactive_pyvistaqt, brain_gc):
773773
def test_brain_save_movie(tmp_path, renderer, brain_gc, interactive_state):
774774
"""Test saving a movie of a Brain instance."""
775775
imageio_ffmpeg = pytest.importorskip("imageio_ffmpeg")
776-
# TODO: Figure out why this fails -- some imageio_ffmpeg error
777-
if os.getenv("MNE_CI_KIND", "") == "conda" and platform.system() == "Linux":
778-
pytest.skip("Test broken for unknown reason on conda linux")
779776

780777
brain = _create_testing_brain(
781778
hemi="lh", time_viewer=False, cortex=["r", "b"]

mne/viz/backends/_pyvista.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1346,7 +1346,7 @@ def _is_osmesa(plotter):
13461346
"surface rendering, consider upgrading to 18.3.6 or "
13471347
"later."
13481348
)
1349-
is_osmesa = "via llvmpipe" in gpu_info
1349+
is_osmesa = "llvmpipe" in gpu_info
13501350
return is_osmesa
13511351

13521352

0 commit comments

Comments
 (0)