Merge branch 'main' into interpolate_bads_bugfix

Author: 1himan

.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'

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/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/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.*",
     ):

examples/inverse/mixed_source_space_inverse.py

@@ -5,8 +5,7 @@
 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]>
 #

mne/channels/tests/test_standard_montage.py

@@ -292,7 +292,7 @@ def test_set_montage_artinis_basic():
     )
     new = RawArray(np.random.normal(size=(2, len(raw))), info_new)
     raw.add_channels([new], force_update_info=True)
-    with pytest.raises(ValueError, match="is not in list"):
+    with pytest.raises(ValueError, match="not in list"):
         raw.set_montage("artinis-brite23")
 
     # Detector not in montage: fail
@@ -302,5 +302,5 @@ def test_set_montage_artinis_basic():
     )
     new = RawArray(np.random.normal(size=(2, len(raw))), info_new)
     raw.add_channels([new], force_update_info=True)
-    with pytest.raises(ValueError, match="is not in list"):
+    with pytest.raises(ValueError, match="not in list"):
         raw.set_montage("artinis-brite23")

mne/datasets/config.py

@@ -87,7 +87,7 @@
 # update the checksum in the MNE_DATASETS dict below, and change version
 # here: ↓↓↓↓↓↓↓↓
 RELEASES = dict(
-    testing="0.170",
+    testing="0.171",
     misc="0.27",
     phantom_kit="0.2",
     ucl_opm_auditory="0.2",
@@ -115,7 +115,7 @@
 # Testing and misc are at the top as they're updated most often
 MNE_DATASETS["testing"] = dict(
     archive_name=f"{TESTING_VERSIONED}.tar.gz",
-    hash="md5:ebd873ea89507cf5a75043f56119d22b",
+    hash="md5:138caf29bd8a9b0a6b6ea43d92c16201",
     url=(
         "https://codeload.github.com/mne-tools/mne-testing-data/"
         f"tar.gz/{RELEASES['testing']}"

mne/forward/_make_forward.py

@@ -496,7 +496,7 @@ def _prepare_for_forward(
     mri_id = dict(machid=np.zeros(2, np.int32), version=0, secs=0, usecs=0)
 
     info_trans = str(trans) if isinstance(trans, Path) else trans
-    info = Info(
+    kwargs_fwd_info = dict(
         chs=info["chs"],
         comps=info["comps"],
         # The forward-writing code always wants a dev_head_t, so give an identity one
@@ -510,6 +510,11 @@ def _prepare_for_forward(
         bads=info["bads"],
         mri_head_t=mri_head_t,
     )
+
+    if "kit_system_id" in info:
+        kwargs_fwd_info["kit_system_id"] = info["kit_system_id"]
+
+    info = Info(**kwargs_fwd_info)
     info._update_redundant()
     info._check_consistency()
     logger.info("")