CI: Try no depth peeling (mne-tools#10078)

Shrecki · Dec 3, 2021 · f2ae58f · f2ae58f
1 parent 8eba560
commit f2ae58f
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -19,8 +19,10 @@ jobs:
         scheduled:
           type: string
           default: "false"
-      machine:
-        image: ubuntu-2004:202111-01
+      docker:
+        # Use 18.04 rather than 20.04 because MESA 20.0.8 on 18.04 has working
+        # transparency but 21.0.3 on 20.04 does not!
+        - image: cimg/base:stable-18.04
       steps:
         - restore_cache:
             keys:
@@ -58,18 +60,13 @@ jobs:
                 echo "Merging $(cat merge.txt)";
                 git pull --ff-only upstream "refs/pull/$(cat merge.txt)/merge";
               else
-                if [ "$CIRCLE_BRANCH" == "main" ]; then
+                if [[ "$CIRCLE_BRANCH" == "main" ]]; then
                   KIND=dev
                 else
                   KIND=stable
                 fi
                 export COMMIT_MESSAGE=$(git log --format=oneline -n 1);
-                if [[ "$COMMIT_MESSAGE" == *"[circle deploy]"* ]]; then
-                  echo "Forced deployed build detected";
-                elif [ "<< parameters.scheduled >>" != "true" ]; then
-                  echo "Waiting until scheduled run to build ${KIND} docs, exiting job ${CIRCLE_JOB}."
-                  circleci-agent step halt;
-                else
+                if [[ "<< parameters.scheduled >>" == "true" ]]; then
                   echo "Scheduled full build detected, checking if it's required."
                   wget https://mne.tools/${KIND}/_version.txt;
                   REMOTE_VERSION=$(cat _version.txt)
@@ -82,14 +79,26 @@ jobs:
                     echo "Rebuild skipped."
                     circleci-agent step halt;
                   fi
+                elif [[ "$COMMIT_MESSAGE" == *"[circle deploy]"* ]]; then
+                  echo "Forced deployed build detected, building and deploying docs";
+                else
+                  echo "Waiting until scheduled run to build ${KIND} docs, exiting job ${CIRCLE_JOB}."
+                  circleci-agent step halt;
                 fi
               fi
 
         - run:
             name: Set BASH_ENV
             command: |
               set -e
-              python3 -m venv ~/python_env --upgrade-deps
+              sudo apt update -qq
+              sudo apt install -qq libosmesa6 libglx-mesa0 libopengl0 libglx0 libdbus-1-3 \
+                libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 \
+                libxcb-render-util0 libxcb-shape0 libxcb-xfixes0 libxcb-xinerama0 \
+                graphviz optipng \
+                python3.8-venv python3-venv \
+                xvfb libxft2 ffmpeg
+              python3.8 -m venv ~/python_env
               echo "set -e" >> $BASH_ENV
               echo "export OPENBLAS_NUM_THREADS=4" >> $BASH_ENV
               echo "export XDG_RUNTIME_DIR=/tmp/runtime-circleci" >> $BASH_ENV
@@ -498,7 +507,8 @@ workflows:
     jobs:
       - build_docs:
           name: build_docs
-      - linkcheck
+      - linkcheck:
+          name: linkcheck
       - deploy:
           name: deploy
           requires:
@@ -521,8 +531,8 @@ workflows:
     triggers:
       - schedule:
           # "At 00:00" (once a day) should be enough "0 0 * * *",
-          # But for testing at first, let's do once an hour
-          cron: "0 0 * * *"
+          # But for testing at first, let's do once an hour (6 AM GMT)
+          cron: "0 6 * * *"
           filters:
             branches:
               only:
@@ -532,6 +542,7 @@ workflows:
   weekly:
     jobs:
       - linkcheck:
+          name: linkcheck_weekly
           scheduled: "true"
     triggers:
       - schedule:

diff --git a/examples/inverse/mixed_source_space_inverse.py b/examples/inverse/mixed_source_space_inverse.py
@@ -3,8 +3,8 @@
 Compute MNE inverse solution on evoked data with a mixed source space
 =====================================================================
 
-Create a mixed source space and compute an MNE inverse solution on an
-evoked dataset.
+Create a mixed source space and compute an MNE inverse solution on an evoked
+dataset.
 """
 # Author: Annalisa Pascarella <[email protected]>
 #

diff --git a/tools/circleci_dependencies.sh b/tools/circleci_dependencies.sh
@@ -13,7 +13,8 @@ if [ ! -f /usr/lib/x86_64-linux-gnu/libxcb-util.so.1 ]; then
 fi
 
 echo "Installing setuptools and sphinx"
-python -m pip install --progress-bar off --upgrade "pip!=20.3.0" setuptools wheel
+python -m pip install --upgrade "pip!=20.3.0"
+python -m pip install --progress-bar off setuptools wheel
 python -m pip install --upgrade --progress-bar off --pre sphinx
 if [[ "$CIRCLE_JOB" == "linkcheck"* ]]; then
 	echo "Installing minimal linkcheck dependencies"

diff --git a/tutorials/clinical/20_seeg.py b/tutorials/clinical/20_seeg.py
@@ -5,8 +5,8 @@
 Working with sEEG data
 ======================
 
-MNE supports working with more than just MEG and EEG data. Here we show some
-of the functions that can be used to facilitate working with
+MNE-Python supports working with more than just MEG and EEG data. Here we show
+some of the functions that can be used to facilitate working with
 stereoelectroencephalography (sEEG) data.
 
 This example shows how to use:

diff --git a/tutorials/inverse/60_visualize_stc.py b/tutorials/inverse/60_visualize_stc.py
@@ -8,7 +8,7 @@
 
 Surface Source Estimates
 ------------------------
-First, we get the paths for the evoked data and the time courses (stcs).
+First, we get the paths for the evoked data and the source time courses (stcs).
 """
 
 # %%
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ @@
     Surface Source Estimates
     ------------------------
-    First, we get the paths for the evoked data and the time courses (stcs).
+    First, we get the paths for the evoked data and the source time courses (stcs).
     """
     # %%
@@ Expand Down @@