Skip to content

Commit 29435fb

Browse files
authored
BUG: Fix bug with error message check (mne-tools#13579)
1 parent a0973c2 commit 29435fb

File tree

7 files changed

+12
-8
lines changed

7 files changed

+12
-8
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
python: '3.13'
7272
kind: pip
7373
- os: ubuntu-latest
74-
python: '3.13'
74+
python: '3.14'
7575
kind: pip-pre
7676
- os: ubuntu-latest
7777
python: '3.13'

doc/changes/dev/13579.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix bug with montage test error message checking, by `Eric Larson`_.

doc/sphinxext/mne_doc_utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ def reset_warnings(gallery_conf, fname):
8080
for message in (
8181
# Matplotlib
8282
".*is non-interactive, and thus cannot.*",
83+
# nilearn
84+
r"You are using the.*matplotlib backend that[.\n]*",
8385
# pybtex
8486
".*pkg_resources is deprecated as an API.*",
8587
):

examples/inverse/mixed_source_space_inverse.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
Compute MNE inverse solution on evoked data with a mixed source space
66
=====================================================================
77
8-
Create a mixed source space and compute an MNE inverse solution on an
9-
evoked dataset.
8+
Create a mixed source space and compute an MNE inverse solution on an evoked dataset.
109
"""
1110
# Author: Annalisa Pascarella <[email protected]>
1211
#

mne/channels/tests/test_standard_montage.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ def test_set_montage_artinis_basic():
292292
)
293293
new = RawArray(np.random.normal(size=(2, len(raw))), info_new)
294294
raw.add_channels([new], force_update_info=True)
295-
with pytest.raises(ValueError, match="is not in list"):
295+
with pytest.raises(ValueError, match="not in list"):
296296
raw.set_montage("artinis-brite23")
297297

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

mne/report/report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3546,7 +3546,7 @@ def _add_projs(
35463546
evoked = None
35473547
if isinstance(info, Info): # no-op
35483548
pass
3549-
elif hasattr(info, "info"): # try to get the file name
3549+
elif isinstance(getattr(info, "info", None), Info): # try to get the file name
35503550
if isinstance(info, Evoked):
35513551
evoked = info
35523552
info = info.info

tools/install_pre_requirements.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ python -m pip install $STD_ARGS --only-binary ":all:" --default-timeout=60 \
2828
"scipy>=1.15.0.dev0" \
2929
"scikit-learn>=1.6.dev0" \
3030
"pandas>=3.0.0.dev0" \
31-
"dipy>=1.10.0.dev0" \
32-
"tables>=3.10.3.dev0" \
3331
"statsmodels>=0.15.0.dev697" \
3432
"pyarrow>=22.0.0.dev0" \
3533
"matplotlib>=3.11.0.dev0" \
3634
"h5py>=3.13.0"
35+
# Needs https://github.com/dipy/dipy/pull/3678
36+
# "dipy>=1.12.0.dev0"
37+
# Needs https://github.com/PyTables/PyTables/pull/1286
38+
# "tables>=3.10.3.dev0"
3739
echo "::endgroup::"
3840
# No Numba because it forces an old NumPy version
3941

0 commit comments

Comments
 (0)