Merge branch 'mne-tools:main' into handle_bad_marker_coils

.circleci/config.yml

@@ -22,58 +22,6 @@ _check_skip: &check_skip
     fi
 
 jobs:
-  pytest-macos-arm64:
-    parameters:
-      scheduled:
-        type: string
-        default: "false"
-    macos:
-      xcode: "14.2.0"
-    resource_class: macos.m1.medium.gen1
-    environment:
-      HOMEBREW_NO_AUTO_UPDATE: 1
-    steps:
-      - checkout
-      - run:
-          <<: *check_skip
-      - run:
-          name: Install Python and dependencies
-          command: |
-            set -eo pipefail
-            brew install [email protected]
-            which python
-            which pip
-            pip install --upgrade pip
-            pip install --upgrade --only-binary "numpy,scipy,dipy,statsmodels" -ve .[full,test_extra]
-            # 3D too slow on Apple's software renderer, and numba causes us problems
-            pip uninstall -y vtk pyvista pyvistaqt numba
-            mkdir -p test-results
-            echo "set -eo pipefail" >> $BASH_ENV
-      - run:
-          command: mne sys_info
-      - run:
-          command: ./tools/get_testing_version.sh && cat testing_version.txt
-      - restore_cache:
-          keys:
-            - data-cache-testing-{{ checksum "testing_version.txt" }}
-      - run:
-          command: python -c "import mne; mne.datasets.testing.data_path(verbose=True)"
-      - save_cache:
-          key: data-cache-testing-{{ checksum "testing_version.txt" }}
-          paths:
-            - ~/mne_data/MNE-testing-data  # (2.5 G)
-      - run:
-          command: pytest -m "not slowtest" --tb=short --cov=mne --cov-report xml -vv mne
-      - run:
-          name: Prepare test data upload
-          command: cp -av junit-results.xml test-results/junit.xml
-      - store_test_results:
-          path: ./test-results
-      # Codecov orb has bugs on macOS (gpg issues)
-      # - codecov/upload
-      - run:
-          command: bash <(curl -s https://codecov.io/bash)
-
   build_docs:
     parameters:
       scheduled:
@@ -591,20 +539,6 @@ workflows:
               only:
                 - main
 
-  weekly:
-    jobs:
-      - pytest-macos-arm64:
-          name: pytest_macos_arm64_weekly
-          scheduled: "true"
-    triggers:
-      - schedule:
-          # "At 6:00 AM GMT every Monday"
-          cron: "0 6 * * 1"
-          filters:
-            branches:
-              only:
-                - main
-
   monthly:
     jobs:
       - linkcheck:

.github/workflows/tests.yml

@@ -61,7 +61,11 @@ jobs:
           - os: ubuntu-latest
             python: '3.12'
             kind: conda
-          - os: macos-latest
+          # 3.12 needs https://github.com/conda-forge/dipy-feedstock/pull/50
+          - os: macos-14  # arm64
+            python: '3.11'
+            kind: mamba
+          - os: macos-latest  # intel
             python: '3.11'
             kind: mamba
           - os: windows-latest
@@ -104,6 +108,9 @@ jobs:
             mamba
             fmt!=10.2.0
         if: ${{ !startswith(matrix.kind, 'pip') }}
+      # Make sure we have the right Python
+      - run: python -c "import platform; assert platform.machine() == 'arm64', platform.machine()"
+        if: matrix.os == 'macos-14'
       - run: ./tools/github_actions_dependencies.sh
       # Minimal commands on Linux (macOS stalls)
       - run: ./tools/get_minimal_commands.sh

doc/changes/devel/12399.bugfix.rst

@@ -0,0 +1 @@
+Fix bugs with :class:`mne.Report` CSS where TOC items could disappear at the bottom of the page, by `Eric Larson`_.

mne/report/js_and_css/report.css

@@ -0,0 +1,19 @@
+#container {
+    position: relative;
+    padding-bottom: 8rem;
+}
+
+#content {
+    margin-top: 90px;
+    scroll-behavior: smooth;
+    position: relative;  /* for scrollspy */
+}
+
+#toc {
+    margin-top: 90px;
+    padding-bottom: 8rem;
+}
+
+footer {
+    margin-top: 8rem;
+}

mne/report/report.py

@@ -143,7 +143,7 @@
 html_include_dir = Path(__file__).parent / "js_and_css"
 template_dir = Path(__file__).parent / "templates"
 JAVASCRIPT = (html_include_dir / "report.js").read_text(encoding="utf-8")
-CSS = (html_include_dir / "report.sass").read_text(encoding="utf-8")
+CSS = (html_include_dir / "report.css").read_text(encoding="utf-8")
 
 MAX_IMG_RES = 100  # in dots per inch
 MAX_IMG_WIDTH = 850  # in pixels