Skip to content

Commit d4f57d7

Browse files
myd7349myd7349
authored
Merge branch 'main' into fix-issue-11267
2 parents a8d30fb + b0e9a85 commit d4f57d7

27 files changed

+999
-65
lines changed

‎.mailmap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Asish Panda <[email protected]> kaichogami <[email protected]>
3030
Basile Pinsard <[email protected]>
3131
Brad Buran <[email protected]> Brad Buran <[email protected]>
3232
Britta Westner <[email protected]> britta-wstnr <[email protected]>
33+
Bruno Aristimunha <[email protected]>
3334
btkcodedev <[email protected]>
3435
buildqa <[email protected]>
3536
Burkhard Maess <[email protected]> Burkhard Maess <[email protected]>

‎doc/changes/devel/13228.newfeature.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add an ``extras`` attribute to :class:`mne.Annotations` for storing arbitrary metadata, by `Pierre Guetschel`_.

‎doc/changes/devel/13268.bugfix.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed bug where the file_id is not set when the file contains a directory at the end of the file, by `Théodore Papadopoulo`_.

‎doc/changes/names.inc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@
234234
.. _Peter Molfese: https://github.com/pmolfese
235235
.. _Phillip Alday: https://palday.bitbucket.io
236236
.. _Pierre Ablin: https://pierreablin.com
237+
.. _Pierre Guetschel: https://github.com/PierreGtch
237238
.. _Pierre-Antoine Bannier: https://github.com/PABannier
238239
.. _Ping-Keng Jao: https://github.com/nafraw
239240
.. _Proloy Das: https://github.com/proloyd

‎doc/sphinxext/prs/13208.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"merge_commit_sha": "46e7071d29d2babf21d4a9d199a3af30120c143e",
3+
"authors": [
4+
{
5+
"n": "Mathieu Scheltienne",
6+
"e": "[email protected]"
7+
},
8+
{
9+
"n": "pre-commit-ci[bot]",
10+
"e": "66853113+pre-commit-ci[bot]@users.noreply.github.com"
11+
}
12+
],
13+
"changes": {
14+
"doc/changes/devel/13208.bugfix.rst.rst": {
15+
"a": 1,
16+
"d": 0
17+
},
18+
"mne/preprocessing/maxwell.py": {
19+
"a": 6,
20+
"d": 1
21+
},
22+
"mne/preprocessing/tests/test_maxwell.py": {
23+
"a": 22,
24+
"d": 1
25+
}
26+
}
27+
}

‎doc/sphinxext/prs/13232.json‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"merge_commit_sha": "0efaf9666de854bc5f35334423b794b63a29a5d9",
3+
"authors": [
4+
{
5+
"n": "Stefan Appelhoff",
6+
"e": "[email protected]"
7+
}
8+
],
9+
"changes": {
10+
"doc/changes/devel/13232.newfeature.rst": {
11+
"a": 1,
12+
"d": 0
13+
},
14+
"mne/forward/_field_interpolation.py": {
15+
"a": 7,
16+
"d": 5
17+
},
18+
"mne/report/report.py": {
19+
"a": 8,
20+
"d": 5
21+
},
22+
"mne/report/tests/test_report.py": {
23+
"a": 5,
24+
"d": 0
25+
},
26+
"mne/tests/test_transforms.py": {
27+
"a": 7,
28+
"d": 2
29+
},
30+
"mne/transforms.py": {
31+
"a": 24,
32+
"d": 13
33+
},
34+
"mne/viz/_3d.py": {
35+
"a": 6,
36+
"d": 5
37+
}
38+
}
39+
}

‎doc/sphinxext/prs/13234.json‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"merge_commit_sha": "dda454d7e4bd2766a2bdff37c06583fde99ba747",
3+
"authors": [
4+
{
5+
"n": "Stefan Appelhoff",
6+
"e": "[email protected]"
7+
},
8+
{
9+
"n": "pre-commit-ci[bot]",
10+
"e": "66853113+pre-commit-ci[bot]@users.noreply.github.com"
11+
}
12+
],
13+
"changes": {
14+
"doc/changes/devel/13234.newfeature.rst": {
15+
"a": 1,
16+
"d": 0
17+
},
18+
"mne/defaults.py": {
19+
"a": 1,
20+
"d": 0
21+
},
22+
"mne/report/report.py": {
23+
"a": 48,
24+
"d": 16
25+
},
26+
"mne/report/tests/test_report.py": {
27+
"a": 6,
28+
"d": 1
29+
}
30+
}
31+
}

‎doc/sphinxext/prs/13237.json‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
{
2+
"merge_commit_sha": "5df1721b488070e3b3928dface9dd0b8c39a3bef",
3+
"authors": [
4+
{
5+
"n": "github-actions[bot]",
6+
"e": "41898282+github-actions[bot]@users.noreply.github.com"
7+
}
8+
],
9+
"changes": {
10+
"doc/sphinxext/credit_tools.py": {
11+
"a": 2,
12+
"d": 0
13+
},
14+
"doc/sphinxext/prs/13120.json": {
15+
"a": 19,
16+
"d": 0
17+
},
18+
"doc/sphinxext/prs/13144.json": {
19+
"a": 51,
20+
"d": 0
21+
},
22+
"doc/sphinxext/prs/13172.json": {
23+
"a": 35,
24+
"d": 0
25+
},
26+
"doc/sphinxext/prs/13173.json": {
27+
"a": 15,
28+
"d": 0
29+
},
30+
"doc/sphinxext/prs/13179.json": {
31+
"a": 75,
32+
"d": 0
33+
},
34+
"doc/sphinxext/prs/13180.json": {
35+
"a": 95,
36+
"d": 0
37+
},
38+
"doc/sphinxext/prs/13183.json": {
39+
"a": 47,
40+
"d": 0
41+
},
42+
"doc/sphinxext/prs/13184.json": {
43+
"a": 27,
44+
"d": 0
45+
},
46+
"doc/sphinxext/prs/13197.json": {
47+
"a": 15,
48+
"d": 0
49+
},
50+
"doc/sphinxext/prs/13198.json": {
51+
"a": 19,
52+
"d": 0
53+
},
54+
"doc/sphinxext/prs/13202.json": {
55+
"a": 23,
56+
"d": 0
57+
},
58+
"doc/sphinxext/prs/13205.json": {
59+
"a": 15,
60+
"d": 0
61+
},
62+
"doc/sphinxext/prs/13207.json": {
63+
"a": 15,
64+
"d": 0
65+
},
66+
"doc/sphinxext/prs/13210.json": {
67+
"a": 39,
68+
"d": 0
69+
},
70+
"doc/sphinxext/prs/13212.json": {
71+
"a": 15,
72+
"d": 0
73+
},
74+
"doc/sphinxext/prs/13214.json": {
75+
"a": 19,
76+
"d": 0
77+
},
78+
"doc/sphinxext/prs/13217.json": {
79+
"a": 15,
80+
"d": 0
81+
},
82+
"doc/sphinxext/prs/13218.json": {
83+
"a": 23,
84+
"d": 0
85+
},
86+
"doc/sphinxext/prs/13222.json": {
87+
"a": 31,
88+
"d": 0
89+
},
90+
"doc/sphinxext/prs/13225.json": {
91+
"a": 35,
92+
"d": 0
93+
},
94+
"doc/sphinxext/prs/13226.json": {
95+
"a": 15,
96+
"d": 0
97+
},
98+
"doc/sphinxext/prs/13233.json": {
99+
"a": 23,
100+
"d": 0
101+
},
102+
"doc/sphinxext/prs/13235.json": {
103+
"a": 15,
104+
"d": 0
105+
},
106+
"doc/sphinxext/prs/13236.json": {
107+
"a": 15,
108+
"d": 0
109+
}
110+
}
111+
}

‎doc/sphinxext/prs/13239.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"merge_commit_sha": "8f0fef638081525f2b13f239d66938ad0b2bdb1a",
3+
"authors": [
4+
{
5+
"n": "dependabot[bot]",
6+
"e": "49699333+dependabot[bot]@users.noreply.github.com"
7+
}
8+
],
9+
"changes": {
10+
".github/workflows/tests.yml": {
11+
"a": 1,
12+
"d": 1
13+
}
14+
}
15+
}

‎doc/sphinxext/prs/13240.json‎

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

0 commit comments

Comments
 (0)