resolve merge conflict - forgot to pull before adding to changelog

Author: CarinaFo

.circleci/config.yml

@@ -296,8 +296,14 @@ jobs:
       # Build docs
       - run:
           name: make html
+          command: |  # we have -o pipefail in #BASH_ENV so we should be okay
+            set -x
+            PATTERN=$(cat pattern.txt) make -C doc $(cat build.txt) 2>&1 | tee sphinx_log.txt
+      - run:
+          name: Check sphinx log for warnings (which are treated as errors)
+          when: always
           command: |
-            PATTERN=$(cat pattern.txt) make -C doc $(cat build.txt);
+            ! grep "^.* WARNING: .*$" sphinx_log.txt
       - run:
           name: Show profiling output
           when: always

.git_archival.txt

@@ -0,0 +1,4 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
+ref-names: $Format:%D$

.gitattributes

@@ -0,0 +1 @@
+.git_archival.txt  export-subst

.github/workflows/tests.yml

@@ -63,16 +63,16 @@ jobs:
             python: '3.11'
             kind: pip-pre
           - os: macos-latest
-            python: '3.8'
+            python: '3.9'
             kind: mamba
           - os: windows-latest
             python: '3.10'
             kind: mamba
           - os: ubuntu-latest
-            python: '3.8'
+            python: '3.9'
             kind: minimal
           - os: ubuntu-20.04
-            python: '3.8'
+            python: '3.9'
             kind: old
     steps:
       - uses: actions/checkout@v4
@@ -90,7 +90,7 @@ jobs:
           python-version: ${{ matrix.python }}
         if: startswith(matrix.kind, 'pip')
       # Python (if conda)
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           environment-file: ${{ env.CONDA_ENV }}

.gitignore

@@ -71,6 +71,8 @@ doc/*.dat
 doc/fil-result
 doc/optipng.exe
 sg_execution_times.rst
+sg_api_usage.rst
+sg_api_unused.dot
 cover
 *.html
 

.mailmap

@@ -240,6 +240,7 @@ Olaf Hauk <olaf.hauk@mrc-cbu.cam.ac.uk> olafhauk <olaf.hauk@mrc-cbu.cam.ac.uk>
 Omer Shubi <omer.shubi@gmail.com> Omer S <omer.shubi@gmail.com>
 Paul Pasler <paul@ppasler.de> ppasler <paul@ppasler.de>
 Paul Roujansky <paul@roujansky.eu> Paul ROUJANSKY <paul.roujansky@bioserenity.com>
+Paul Roujansky <paul@roujansky.eu> paulroujansky <paul@roujansky.eu>
 Pedro Silva <pedrobnsilva@gmail.com> pbnsilva <pedrobnsilva@gmail.com>
 Phillip Alday <phillip.alday@mpi.nl> Phillip Alday <palday@users.noreply.github.com>
 Phillip Alday <phillip.alday@mpi.nl> Phillip Alday <phillip.alday@unisa.edu.au>
@@ -254,6 +255,7 @@ Praveen Sripad <pravsripad@gmail.com> prav <pravsripad@gmail.com>
 Proloy Das <pdas6@mgh.harvard.edu> pdas6 <pdas6@mgh.harvard.edu>
 Ram Pari <ramsbam@gmail.com> Ram <ramsbam@gmail.com>
 Ramonapariciog Apariciogarcia <moncho_apa@hotmail.com> ramonapariciog <moncho_apa@hotmail.com>
+Rasmus Aagaard <roraa@dtu.dk> roraa <roraa@dtu.dk>
 Reza Nasri <reza@ddpo.ir> Reza <qablameh13@gmail.com>
 Reza Nasri <reza@ddpo.ir> RezaNasri <rezanasri@outlook.com>
 Roan LaPlante <aestrivex@gmail.com> aestrivex <aestrivex@gmail.com>

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ repos:
 
   # Ruff mne
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.5
+    rev: v0.1.6
     hooks:
       - id: ruff
         name: ruff mne
@@ -16,7 +16,7 @@ repos:
 
   # Ruff tutorials and examples
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.5
+    rev: v0.1.6
     hooks:
       - id: ruff
         name: ruff tutorials and examples
@@ -50,3 +50,6 @@ repos:
         additional_dependencies:
           - tomli
         files: ^doc/.*\.(rst|inc)$
+
+ci:
+  autofix_prs: false