FIX: More

Author: larsoner

mne/tests/test_surface.py

@@ -2,6 +2,7 @@
 # License: BSD-3-Clause
 # Copyright the MNE-Python contributors.
 
+import os
 from pathlib import Path
 
 import numpy as np
@@ -252,6 +253,8 @@ def test_normal_orth():
 def test_marching_cubes(dtype, value, smooth, order):
     """Test creating surfaces via marching cubes."""
     pytest.importorskip("pyvista")
+    if os.getenv("MNE_CI_KIND") in ("conda", "mamba"):
+        pytest.skip("VTK on conda CIs segfaults")
     data = np.zeros((50, 50, 50), dtype=dtype, order=order)
     data[20:30, 20:30, 20:30] = value
     level = [value]

tools/github_actions_env_vars.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eo pipefail -x
+set -eo pipefail
 
 # old and minimal use conda
 if [[ "$MNE_CI_KIND" == "pip"* ]]; then
@@ -27,7 +27,7 @@ else  # conda-like
         echo "MNE_LOGGING_LEVEL=warning" | tee -a $GITHUB_ENV
         echo "MNE_QT_BACKEND=PySide6" | tee -a $GITHUB_ENV
         # TODO: Also need "|unreliable on GitHub Actions conda" on macOS, but omit for now to make sure the failure actually shows up
-        echo "MNE_TEST_ALLOW_SKIP=.*(Requires (spm|brainstorm) dataset|CUDA not|PySide6 causes segfaults|Accelerate|Flakey verbose behavior).*" | tee -a $GITHUB_ENV
+        echo "MNE_TEST_ALLOW_SKIP=.*(Requires (spm|brainstorm) dataset|CUDA not|PySide6 causes segfaults|Accelerate|Flakey verbose behavior|VTK on conda).*" | tee -a $GITHUB_ENV
         # Our cache_dir test has problems when the path is too long, so prevent it from getting too long
         if [[ "$RUNNER_OS" == "macOS" ]]; then
             echo "PYTEST_DEBUG_TEMPROOT=/tmp" | tee -a $GITHUB_ENV

tools/github_actions_verify_python.sh

@@ -3,24 +3,24 @@
 set -eo pipefail
 
 GOT_PYTHON=$(which python)
-echo "Checking Python at:
-echo "  which python=${GOT_PYTHON}
+echo "Checking Python found at:"
+echo "  $(which python) == ${GOT_PYTHON}"
 echo "for"
-echo "  MNE_CI_KIND=${MNE_CI_KIND}"
+echo "  \$MNE_CI_KIND   == ${MNE_CI_KIND}"
 if [[ "${MNE_CI_KIND}" == "conda" ]] || [[ "${MNE_CI_KIND}" == "mamba" ]]; then
 	WANT="micromamba/envs/mne"
 elif [[ "${MNE_CI_KIND}" == "old" ]]; then
 	WANT="mne-python/mne-python/.venv/bin"
 elif [[ "${MNE_CI_KIND}" == "pip" ]] || [[ "${MNE_CI_KIND}" == "pip-pre" ]]; then
 	WANT="hostedtoolcache/Python"
 else
-	echo "ERROR: Unrecognized MNE_CI_KIND=${MNE_CI_KIND}"
+	echo "✕ ERROR: Unrecognized MNE_CI_KIND=${MNE_CI_KIND}"
 	exit 1
 fi
 if [[ "${GOT_PYTHON}" != *"${WANT}"* ]]; then
-	echo "ERROR: Did not find \"${WANT}\" from PATH:"
+	echo "✕ ERROR: Did not find \"${WANT}\" from PATH:"
 	tr ':' '\n' <<< "$PATH"
 	exit 1
 else
-	echo "OK: Found expected \"${WANT}\""
+	echo "☑ Found expected \"${WANT}\""
 fi