Merge branch 'main' into enh-plot-alignment-channel-names

Author: aman-coder03

.github/workflows/tests.yml

@@ -71,7 +71,7 @@ jobs:
             python: '3.13'
             kind: pip
           - os: ubuntu-latest
-            python: '3.13'
+            python: '3.14'
             kind: pip-pre
           - os: ubuntu-latest
             python: '3.13'

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   # Ruff mne
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.10
+    rev: v0.14.11
     hooks:
       - id: ruff-check
         name: ruff lint mne
@@ -82,7 +82,7 @@ repos:
 
   # zizmor
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.19.0
+    rev: v1.20.0
     hooks:
       - id: zizmor
         args: [--fix]

doc/changes/dev/13408.newfeature.rst

@@ -0,0 +1 @@
+Add support for multi-wavelength NIRS processing to :func:`mne.preprocessing.nirs.beer_lambert_law`, :func:`mne.preprocessing.nirs.scalp_coupling_index`, and SNIRF reader :func:`mne.io.read_raw_snirf`, by :newcontrib:`Tamas Fehervari`.

doc/changes/dev/13520.bugfix.rst

@@ -0,0 +1 @@
+Preserve ``kit_system_id`` in forward-solution ``Info``, by :newcontrib: 'Melih Yayli'

doc/changes/dev/13579.bugfix.rst

@@ -0,0 +1 @@
+Fix bug with montage test error message checking, by `Eric Larson`_.

doc/changes/dev/13585.other.rst

@@ -0,0 +1 @@
+Fix deprecation of setting a shape on an array directly in ``numpy`` 2.5+, by `Mathieu Scheltienne`_.

doc/changes/names.inc

@@ -210,6 +210,7 @@
 .. _Matti Hämäläinen: https://research.aalto.fi/en/persons/matti-h%C3%A4m%C3%A4l%C3%A4inen/
 .. _Matti Toivonen: https://github.com/mattitoi
 .. _Mauricio Cespedes Tenorio: https://github.com/mcespedes99
+.. _Melih Yayli: https://github.com/yaylim
 .. _Michael Straube: https://github.com/mistraube
 .. _Michal Žák: https://github.com/michalrzak
 .. _Michiru Kaneda: https://github.com/rcmdnk
@@ -319,6 +320,7 @@
 .. _Sébastien Marti: https://www.researchgate.net/profile/Sebastien-Marti
 .. _T. Wang: https://github.com/twang5
 .. _Tal Linzen: https://tallinzen.net/
+.. _Tamas Fehervari: https://github.com/zEdS15B3GCwq
 .. _Teon Brooks: https://github.com/teonbrooks
 .. _Tharupahan Jayawardana: https://github.com/tharu-jwd
 .. _Thomas Binns: https://github.com/tsbinns

doc/sphinxext/credit_tools.py

@@ -38,7 +38,7 @@
 # preferring GitHub profile info (when complete!) is probably preferable.
 
 # Allowed singletons
-single_names = "btkcodedev buildqa sviter Akshay user27182 Mojackhak".split()
+single_names = "btkcodedev buildqa sviter Akshay user27182 Mojackhak mne[bot]".split()
 # Surnames where we have more than one distinct contributor:
 name_counts = dict(
     Bailey=2,
@@ -93,6 +93,8 @@ def _good_name(name):
     if name is None:
         return False
     assert isinstance(name, str), type(name)
+    if name == "mne[bot]":
+        return True
     if not name.strip():
         return False
     if " " not in name and name not in single_names:  # at least two parts

doc/sphinxext/mne_doc_utils.py

@@ -80,6 +80,8 @@ def reset_warnings(gallery_conf, fname):
     for message in (
         # Matplotlib
         ".*is non-interactive, and thus cannot.*",
+        # nilearn
+        r"You are using the.*matplotlib backend that[.\n]*",
         # pybtex
         ".*pkg_resources is deprecated as an API.*",
     ):

doc/sphinxext/prs/13516.json

@@ -0,0 +1,63 @@
+{
+  "merge_commit_sha": "2b2113546757cfe1a49c8dbcf0b8eeb90eb45006",
+  "authors": [
+    {
+      "n": "mne[bot]",
+      "e": null
+    },
+    {
+      "n": "Eric Larson",
+      "e": "larson.eric.d@gmail.com"
+    }
+  ],
+  "changes": {
+    "doc/_static/js/contrib-avatars.js": {
+      "a": 1,
+      "d": 1
+    },
+    "doc/conf.py": {
+      "a": 2,
+      "d": 2
+    },
+    "doc/development/governance.rst": {
+      "a": 1,
+      "d": 1
+    },
+    "doc/sphinxext/credit_tools.py": {
+      "a": 1,
+      "d": 0
+    },
+    "doc/sphinxext/prs/13501.json": {
+      "a": 351,
+      "d": 0
+    },
+    "doc/sphinxext/prs/13503.json": {
+      "a": 47,
+      "d": 0
+    },
+    "doc/sphinxext/prs/13504.json": {
+      "a": 31,
+      "d": 0
+    },
+    "doc/sphinxext/prs/13505.json": {
+      "a": 19,
+      "d": 0
+    },
+    "doc/sphinxext/prs/13509.json": {
+      "a": 27,
+      "d": 0
+    },
+    "doc/sphinxext/prs/13510.json": {
+      "a": 19,
+      "d": 0
+    },
+    "doc/sphinxext/prs/13514.json": {
+      "a": 15,
+      "d": 0
+    },
+    "doc/sphinxext/prs/13515.json": {
+      "a": 19,
+      "d": 0
+    }
+  }
+}