Backport PR #13082 on branch maint/1.9 (BUG: Fix bug with Mesa 3D det…

…ection) (#13084) Co-authored-by: Eric Larson <[email protected]>
mne-tools · Jan 24, 2025 · d3d0bf5 · d3d0bf5
1 parent d596b6d
commit d3d0bf5
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/doc/changes/devel/13082.bugfix.rst b/doc/changes/devel/13082.bugfix.rst
@@ -0,0 +1 @@
+Fix bug with automated Mesa 3D detection for proper 3D option setting on systems with software rendering, by `Eric Larson`_.
diff --git a/examples/preprocessing/movement_detection.py b/examples/preprocessing/movement_detection.py
@@ -81,6 +81,7 @@
 ##############################################################################
 # After checking the annotated movement artifacts, calculate the new transform
 # and plot it:
+
 new_dev_head_t = compute_average_dev_head_t(raw, head_pos)
 raw.info["dev_head_t"] = new_dev_head_t
 fig = mne.viz.plot_alignment(

diff --git a/mne/conftest.py b/mne/conftest.py
@@ -172,6 +172,7 @@ def pytest_configure(config):
     # pandas
     ignore:\n*Pyarrow will become a required dependency of pandas.*:DeprecationWarning
     ignore:np\.find_common_type is deprecated.*:DeprecationWarning
+    ignore:Python binding for RankQuantileOptions.*:
     # pyvista <-> NumPy 2.0
     ignore:__array_wrap__ must accept context and return_scalar arguments.*:DeprecationWarning
     # nibabel <-> NumPy 2.0

diff --git a/mne/viz/_brain/tests/test_brain.py b/mne/viz/_brain/tests/test_brain.py
@@ -773,9 +773,6 @@ def test_single_hemi(hemi, renderer_interactive_pyvistaqt, brain_gc):
 def test_brain_save_movie(tmp_path, renderer, brain_gc, interactive_state):
     """Test saving a movie of a Brain instance."""
     imageio_ffmpeg = pytest.importorskip("imageio_ffmpeg")
-    # TODO: Figure out why this fails -- some imageio_ffmpeg error
-    if os.getenv("MNE_CI_KIND", "") == "conda" and platform.system() == "Linux":
-        pytest.skip("Test broken for unknown reason on conda linux")
 
     brain = _create_testing_brain(
         hemi="lh", time_viewer=False, cortex=["r", "b"]

diff --git a/mne/viz/backends/_pyvista.py b/mne/viz/backends/_pyvista.py
@@ -1346,7 +1346,7 @@ def _is_osmesa(plotter):
                     "surface rendering, consider upgrading to 18.3.6 or "
                     "later."
                 )
-        is_osmesa = "via llvmpipe" in gpu_info
+        is_osmesa = "llvmpipe" in gpu_info
     return is_osmesa
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix bug with automated Mesa 3D detection for proper 3D option setting on systems with software rendering, by `Eric Larson`_.