FIX: More

Author: larsoner

.github/workflows/tests.yml

@@ -128,6 +128,7 @@ jobs:
         if: matrix.kind == 'old'
       - run: bash ./tools/github_actions_verify_python.sh "${{ matrix.python }}"
       - run: bash ./tools/github_actions_dependencies.sh
+        timeout-minutes: 5
       - run: python ./tools/github_actions_check_old_env.py
         if: matrix.kind == 'old'
       # Minimal commands on Linux (macOS stalls)

tools/get_minimal_commands.sh

@@ -79,4 +79,3 @@ which mne_surf2bem
 mne_surf2bem --version
 which mri_average
 mri_average --version
-set +x

tools/github_actions_dependencies.sh

@@ -12,7 +12,7 @@ if [ ! -z "$CONDA_ENV" ]; then
 	conda remove -c conda-forge --force -y mne-base
 	echo "::endgroup::"
 	# If not on windows, do a non-editable install
-	if [[ "${RUNNER_OS}" != "Windows" ]]; then
+	if [[ "${CI_OS_NAME}" != "windows"* ]]; then
 		INSTALL_ARGS=""
 	fi
 	GROUP="test_extra"
@@ -22,7 +22,7 @@ elif [[ "${MNE_CI_KIND}" == "minimal" ]]; then
 	EXTRAS=""
 	STD_ARGS="--progress-bar off ${MNE_QT_BACKEND}"
 	echo "::group::Upgrading pip installation"
-	python -m pip install --upgrade pip  # upgrade pip to support --group
+	python -m pip install --upgrade pip setuptools
 	echo "::endgroup::"
 elif [[ "${MNE_CI_KIND}" == "old" ]]; then
 	GROUP=""  # group "test" already included when pylock file generated
@@ -35,10 +35,12 @@ elif [[ "${MNE_CI_KIND}" == "old" ]]; then
 elif [[ "${MNE_CI_KIND}" == "pip" ]]; then
 	GROUP="test_extra"
 	EXTRAS="[full-pyside6]"
+	python -m pip install --upgrade pip setuptools
 else
 	test "${MNE_CI_KIND}" == "pip-pre"
+	python -m pip install $STD_ARGS pip setuptools
 	STD_ARGS="$STD_ARGS --pre"
-	${SCRIPT_DIR}/install_pre_requirements.sh || exit 1
+	${SCRIPT_DIR}/install_pre_requirements.sh
 	GROUP="test_extra"
 	EXTRAS=""
 fi
@@ -58,5 +60,4 @@ else
 fi
 set -x
 python -m pip install $STD_ARGS $ONLY_BINARY_ARG $INSTALL_ARGS .$EXTRAS $GROUP_ARG
-set +x
 echo "::endgroup::"

tools/github_actions_env_vars.sh

@@ -21,12 +21,14 @@ elif [[ "$MNE_CI_KIND" == "conda" ]]; then
     echo "MNE_LOGGING_LEVEL=warning" | tee -a $GITHUB_ENV
     echo "MNE_TEST_ALLOW_SKIP=.*(Requires (spm|brainstorm) dataset|CUDA not|PySide6 causes segfaults|Accelerate|Flakey verbose behavior).*" | 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
+    if [[ "$CI_OS_NAME" == "macos"* ]]; then
         echo "PYTEST_DEBUG_TEMPROOT=/tmp" | tee -a $GITHUB_ENV
     fi
     echo "MNE_QT_BACKEND=PySide6" | tee -a $GITHUB_ENV
 else
     echo "✕ ERROR: Unrecognized MNE_CI_KIND=${MNE_CI_KIND}"
     exit 1
 fi
-set +x
+if [[ "$CI_OS_NAME" == "windows"* ]]; then
+    echo "MNE_IS_OSMESA=true" | tee -a $GITHUB_ENV
+fi

tools/github_actions_test.sh

@@ -23,7 +23,7 @@ else
   USE_DIRS="mne/"
 fi
 JUNIT_PATH="junit-results.xml"
-if [[ ! -z "$CONDA_ENV" ]] && [[ "${RUNNER_OS}" != "Windows" ]] && [[ "${MNE_CI_KIND}" != "minimal" ]] && [[ "${MNE_CI_KIND}" != "old" ]]; then
+if [[ ! -z "$CONDA_ENV" ]] && [[ "${CI_OS_NAME}" != "windows"* ]] && [[ "${MNE_CI_KIND}" != "minimal" ]] && [[ "${MNE_CI_KIND}" != "old" ]]; then
   PROJ_PATH="$(pwd)"
   JUNIT_PATH="$PROJ_PATH/${JUNIT_PATH}"
   # Use the installed version after adding all (excluded) test files