Skip to content

Commit 2f9f9ea

Browse files
committed
Merge remote-tracking branch 'upstream/main' into cnt-overflow-fix
* upstream/main: BUG: Fix bug with error message check (mne-tools#13579) Add QC + Full MNE Report tutorial (mne-tools#13532) FIX: adding kit_system_id info to forward solution (mne-tools#13520) MAINT: Update code credit (mne-tools#13572) MAINT: Fix Circle (mne-tools#13574) DOC: Clarify read_raw_nirx expects directory path, not file path (mne-tools#13541)
2 parents 74d66ba + 29435fb commit 2f9f9ea

36 files changed

+935
-14
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/13520.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Preserve ``kit_system_id`` in forward-solution ``Info``, by :newcontrib: 'Melih Yayli'

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/changes/names.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@
210210
.. _Matti Hämäläinen: https://research.aalto.fi/en/persons/matti-h%C3%A4m%C3%A4l%C3%A4inen/
211211
.. _Matti Toivonen: https://github.com/mattitoi
212212
.. _Mauricio Cespedes Tenorio: https://github.com/mcespedes99
213+
.. _Melih Yayli: https://github.com/yaylim
213214
.. _Michael Straube: https://github.com/mistraube
214215
.. _Michal Žák: https://github.com/michalrzak
215216
.. _Michiru Kaneda: https://github.com/rcmdnk

doc/sphinxext/credit_tools.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
# preferring GitHub profile info (when complete!) is probably preferable.
3939

4040
# Allowed singletons
41-
single_names = "btkcodedev buildqa sviter Akshay user27182 Mojackhak".split()
41+
single_names = "btkcodedev buildqa sviter Akshay user27182 Mojackhak mne[bot]".split()
4242
# Surnames where we have more than one distinct contributor:
4343
name_counts = dict(
4444
Bailey=2,
@@ -93,6 +93,8 @@ def _good_name(name):
9393
if name is None:
9494
return False
9595
assert isinstance(name, str), type(name)
96+
if name == "mne[bot]":
97+
return True
9698
if not name.strip():
9799
return False
98100
if " " not in name and name not in single_names: # at least two parts

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
):

doc/sphinxext/prs/13516.json

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"merge_commit_sha": "2b2113546757cfe1a49c8dbcf0b8eeb90eb45006",
3+
"authors": [
4+
{
5+
"n": "mne[bot]",
6+
"e": null
7+
},
8+
{
9+
"n": "Eric Larson",
10+
11+
}
12+
],
13+
"changes": {
14+
"doc/_static/js/contrib-avatars.js": {
15+
"a": 1,
16+
"d": 1
17+
},
18+
"doc/conf.py": {
19+
"a": 2,
20+
"d": 2
21+
},
22+
"doc/development/governance.rst": {
23+
"a": 1,
24+
"d": 1
25+
},
26+
"doc/sphinxext/credit_tools.py": {
27+
"a": 1,
28+
"d": 0
29+
},
30+
"doc/sphinxext/prs/13501.json": {
31+
"a": 351,
32+
"d": 0
33+
},
34+
"doc/sphinxext/prs/13503.json": {
35+
"a": 47,
36+
"d": 0
37+
},
38+
"doc/sphinxext/prs/13504.json": {
39+
"a": 31,
40+
"d": 0
41+
},
42+
"doc/sphinxext/prs/13505.json": {
43+
"a": 19,
44+
"d": 0
45+
},
46+
"doc/sphinxext/prs/13509.json": {
47+
"a": 27,
48+
"d": 0
49+
},
50+
"doc/sphinxext/prs/13510.json": {
51+
"a": 19,
52+
"d": 0
53+
},
54+
"doc/sphinxext/prs/13514.json": {
55+
"a": 15,
56+
"d": 0
57+
},
58+
"doc/sphinxext/prs/13515.json": {
59+
"a": 19,
60+
"d": 0
61+
}
62+
}
63+
}

doc/sphinxext/prs/13517.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"merge_commit_sha": "04cd7c50f1638e19b723ad98ecf99a4f94393912",
3+
"authors": [
4+
{
5+
"n": "dependabot[bot]",
6+
"e": "49699333+dependabot[bot]@users.noreply.github.com"
7+
},
8+
{
9+
"n": "mne[bot]",
10+
11+
}
12+
],
13+
"changes": {
14+
".github/workflows/autofix.yml": {
15+
"a": 1,
16+
"d": 1
17+
},
18+
".github/workflows/autopush.yml": {
19+
"a": 1,
20+
"d": 1
21+
},
22+
".github/workflows/check_changelog.yml": {
23+
"a": 1,
24+
"d": 1
25+
},
26+
".github/workflows/codeql-analysis.yml": {
27+
"a": 1,
28+
"d": 1
29+
},
30+
".github/workflows/credit.yml": {
31+
"a": 1,
32+
"d": 1
33+
},
34+
".github/workflows/release.yml": {
35+
"a": 1,
36+
"d": 1
37+
},
38+
".github/workflows/spec_zero.yml": {
39+
"a": 1,
40+
"d": 1
41+
},
42+
".github/workflows/tests.yml": {
43+
"a": 2,
44+
"d": 2
45+
}
46+
}
47+
}

doc/sphinxext/prs/13519.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"merge_commit_sha": "12694e644657b142bbc1f17bf1f73f6ce2051586",
3+
"authors": [
4+
{
5+
"n": "pre-commit-ci[bot]",
6+
"e": "66853113+pre-commit-ci[bot]@users.noreply.github.com"
7+
},
8+
{
9+
"n": "mne[bot]",
10+
11+
}
12+
],
13+
"changes": {
14+
".pre-commit-config.yaml": {
15+
"a": 2,
16+
"d": 2
17+
}
18+
}
19+
}

doc/sphinxext/prs/13521.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"merge_commit_sha": "adcbae3c131bb0b0367b1f996efcf8677ca70024",
3+
"authors": [
4+
{
5+
"n": "Thomas S. Binns",
6+
7+
}
8+
],
9+
"changes": {
10+
"doc/changes/dev/13521.bugfix.rst": {
11+
"a": 1,
12+
"d": 0
13+
},
14+
"mne/time_frequency/spectrum.py": {
15+
"a": 1,
16+
"d": 1
17+
},
18+
"mne/time_frequency/tests/test_spectrum.py": {
19+
"a": 7,
20+
"d": 0
21+
},
22+
"mne/time_frequency/tests/test_tfr.py": {
23+
"a": 9,
24+
"d": 0
25+
},
26+
"mne/time_frequency/tfr.py": {
27+
"a": 0,
28+
"d": 1
29+
}
30+
}
31+
}

0 commit comments

Comments
 (0)