Skip to content

Commit 1021712

Browse files
larsonerlarsoner
authored
Merge branch 'main' into rel
2 parents 2963340 + 56f863d commit 1021712

12 files changed

Lines changed: 470 additions & 1 deletion

File tree

‎doc/sphinxext/credit_tools.py‎

Lines changed: 1 addition & 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".split()
41+
single_names = "btkcodedev buildqa sviter Akshay user27182 Mojackhak".split()
4242
# Surnames where we have more than one distinct contributor:
4343
name_counts = dict(
4444
Bailey=2,

‎doc/sphinxext/prs/12848.json‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
{
2+
"merge_commit_sha": "715784fb3f4276ee977f6bf12c67b57dd9e47843",
3+
"authors": [
4+
{
5+
"n": "Victor Férat",
6+
"e": "victor.ferat@live.Fr"
7+
},
8+
{
9+
"n": "pre-commit-ci[bot]",
10+
"e": "66853113+pre-commit-ci[bot]@users.noreply.github.com"
11+
},
12+
{
13+
"n": "Eric Larson",
14+
"e": "larson.eric.d@gmail.com"
15+
}
16+
],
17+
"changes": {
18+
"doc/changes/devel/12848.newfeature.rst": {
19+
"a": 1,
20+
"d": 0
21+
},
22+
"mne/report/report.py": {
23+
"a": 134,
24+
"d": 5
25+
},
26+
"mne/report/tests/test_report.py": {
27+
"a": 25,
28+
"d": 1
29+
},
30+
"mne/source_space/_source_space.py": {
31+
"a": 8,
32+
"d": 0
33+
},
34+
"mne/tests/test_epochs.py": {
35+
"a": 1,
36+
"d": 1
37+
},
38+
"mne/transforms.py": {
39+
"a": 6,
40+
"d": 5
41+
},
42+
"mne/utils/check.py": {
43+
"a": 2,
44+
"d": 1
45+
},
46+
"mne/viz/_brain/view.py": {
47+
"a": 35,
48+
"d": 1
49+
},
50+
"mne/viz/misc.py": {
51+
"a": 18,
52+
"d": 8
53+
},
54+
"mne/viz/tests/test_misc.py": {
55+
"a": 1,
56+
"d": 1
57+
},
58+
"tools/github_actions_dependencies.sh": {
59+
"a": 1,
60+
"d": 1
61+
},
62+
"tutorials/intro/70_report.py": {
63+
"a": 3,
64+
"d": 4
65+
}
66+
}
67+
}

‎doc/sphinxext/prs/13298.json‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"merge_commit_sha": "5009ee876e6b905eb25a37a0e45c75aa7b4c6e9f",
3+
"authors": [
4+
{
5+
"n": "Clemens Brunner",
6+
"e": null
7+
},
8+
{
9+
"n": "Daniel McCloy",
10+
"e": "dan@mccloy.info"
11+
}
12+
],
13+
"changes": {
14+
"doc/changes/devel/13298.bugfix.rst": {
15+
"a": 1,
16+
"d": 0
17+
},
18+
"mne/time_frequency/spectrum.py": {
19+
"a": 2,
20+
"d": 2
21+
},
22+
"mne/time_frequency/tfr.py": {
23+
"a": 3,
24+
"d": 3
25+
},
26+
"mne/utils/docs.py": {
27+
"a": 20,
28+
"d": 16
29+
},
30+
"mne/viz/tests/test_raw.py": {
31+
"a": 14,
32+
"d": 9
33+
},
34+
"mne/viz/utils.py": {
35+
"a": 6,
36+
"d": 9
37+
},
38+
"tutorials/time-freq/10_spectrum_class.py": {
39+
"a": 1,
40+
"d": 1
41+
}
42+
}
43+
}

‎doc/sphinxext/prs/13304.json‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"merge_commit_sha": "d193166134dcc30c3c2bf154ec188f63913d6ea6",
3+
"authors": [
4+
{
5+
"n": "Teon L Brooks",
6+
"e": null
7+
},
8+
{
9+
"n": "Daniel McCloy",
10+
"e": "dan@mccloy.info"
11+
}
12+
],
13+
"changes": {
14+
"doc/conf.py": {
15+
"a": 1,
16+
"d": 1
17+
},
18+
"doc/links.inc": {
19+
"a": 1,
20+
"d": 1
21+
},
22+
"mne/annotations.py": {
23+
"a": 1,
24+
"d": 0
25+
},
26+
"mne/utils/docs.py": {
27+
"a": 1,
28+
"d": 1
29+
}
30+
}
31+
}

‎doc/sphinxext/prs/13305.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"merge_commit_sha": "a4a614f72da25c43a509b0ec987dbe7620d08981",
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+
}

‎doc/sphinxext/prs/13306.json‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
{
2+
"merge_commit_sha": "6ad882335644fb80f8744e508387c52f7231553a",
3+
"authors": [
4+
{
5+
"n": "github-actions[bot]",
6+
"e": "41898282+github-actions[bot]@users.noreply.github.com"
7+
},
8+
{
9+
"n": "Eric Larson",
10+
"e": "larson.eric.d@gmail.com"
11+
}
12+
],
13+
"changes": {
14+
".mailmap": {
15+
"a": 2,
16+
"d": 0
17+
},
18+
"doc/sphinxext/credit_tools.py": {
19+
"a": 1,
20+
"d": 1
21+
},
22+
"doc/sphinxext/prs/13228.json": {
23+
"a": 59,
24+
"d": 0
25+
},
26+
"doc/sphinxext/prs/13261.json": {
27+
"a": 47,
28+
"d": 0
29+
},
30+
"doc/sphinxext/prs/13266.json": {
31+
"a": 19,
32+
"d": 0
33+
},
34+
"doc/sphinxext/prs/13267.json": {
35+
"a": 79,
36+
"d": 0
37+
},
38+
"doc/sphinxext/prs/13268.json": {
39+
"a": 19,
40+
"d": 0
41+
},
42+
"doc/sphinxext/prs/13273.json": {
43+
"a": 23,
44+
"d": 0
45+
},
46+
"doc/sphinxext/prs/13274.json": {
47+
"a": 39,
48+
"d": 0
49+
},
50+
"doc/sphinxext/prs/13276.json": {
51+
"a": 31,
52+
"d": 0
53+
},
54+
"doc/sphinxext/prs/13277.json": {
55+
"a": 23,
56+
"d": 0
57+
},
58+
"doc/sphinxext/prs/13280.json": {
59+
"a": 23,
60+
"d": 0
61+
},
62+
"doc/sphinxext/prs/13282.json": {
63+
"a": 23,
64+
"d": 0
65+
},
66+
"doc/sphinxext/prs/13283.json": {
67+
"a": 15,
68+
"d": 0
69+
},
70+
"doc/sphinxext/prs/13284.json": {
71+
"a": 35,
72+
"d": 0
73+
},
74+
"doc/sphinxext/prs/13286.json": {
75+
"a": 31,
76+
"d": 0
77+
},
78+
"doc/sphinxext/prs/13290.json": {
79+
"a": 19,
80+
"d": 0
81+
},
82+
"doc/sphinxext/prs/13291.json": {
83+
"a": 19,
84+
"d": 0
85+
},
86+
"doc/sphinxext/prs/13293.json": {
87+
"a": 19,
88+
"d": 0
89+
},
90+
"doc/sphinxext/prs/13299.json": {
91+
"a": 27,
92+
"d": 0
93+
},
94+
"doc/sphinxext/prs/13300.json": {
95+
"a": 15,
96+
"d": 0
97+
},
98+
"doc/sphinxext/prs/13301.json": {
99+
"a": 15,
100+
"d": 0
101+
}
102+
}
103+
}

‎doc/sphinxext/prs/13308.json‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
{
2+
"merge_commit_sha": "d970efb081463306fa29fde33d8c995ef649ee56",
3+
"authors": [
4+
{
5+
"n": "Eric Larson",
6+
"e": "larson.eric.d@gmail.com"
7+
},
8+
{
9+
"n": "autofix-ci[bot]",
10+
"e": "114827586+autofix-ci[bot]@users.noreply.github.com"
11+
}
12+
],
13+
"changes": {
14+
"environment.yml": {
15+
"a": 3,
16+
"d": 3
17+
},
18+
"mne/decoding/_fixes.py": {
19+
"a": 132,
20+
"d": 0
21+
},
22+
"mne/decoding/tests/test_base.py": {
23+
"a": 3,
24+
"d": 1
25+
},
26+
"mne/decoding/tests/test_csp.py": {
27+
"a": 1,
28+
"d": 0
29+
},
30+
"mne/decoding/tests/test_ems.py": {
31+
"a": 1,
32+
"d": 0
33+
},
34+
"mne/decoding/tests/test_ssd.py": {
35+
"a": 1,
36+
"d": 0
37+
},
38+
"mne/decoding/tests/test_time_frequency.py": {
39+
"a": 1,
40+
"d": 0
41+
},
42+
"mne/decoding/tests/test_transformer.py": {
43+
"a": 1,
44+
"d": 0
45+
},
46+
"mne/decoding/transformer.py": {
47+
"a": 6,
48+
"d": 3
49+
},
50+
"mne/inverse_sparse/tests/test_mxne_inverse.py": {
51+
"a": 13,
52+
"d": 3
53+
},
54+
"pyproject.toml": {
55+
"a": 1,
56+
"d": 1
57+
},
58+
"tools/environment_old.yml": {
59+
"a": 1,
60+
"d": 1
61+
},
62+
"tools/hooks/update_environment_file.py": {
63+
"a": 1,
64+
"d": 6
65+
}
66+
}
67+
}

‎doc/sphinxext/prs/13310.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"merge_commit_sha": "3612f7bc3dbe57a4de2d976d749703bd75001d29",
3+
"authors": [
4+
{
5+
"n": "Eric Larson",
6+
"e": "larson.eric.d@gmail.com"
7+
},
8+
{
9+
"n": "autofix-ci[bot]",
10+
"e": "114827586+autofix-ci[bot]@users.noreply.github.com"
11+
},
12+
{
13+
"n": "Stefan Appelhoff",
14+
"e": "stefan.appelhoff@mailbox.org"
15+
}
16+
],
17+
"changes": {
18+
"doc/changes/devel/13310.bugfix.rst": {
19+
"a": 1,
20+
"d": 0
21+
},
22+
"mne/_fiff/meas_info.py": {
23+
"a": 2,
24+
"d": 2
25+
},
26+
"mne/_fiff/tests/test_meas_info.py": {
27+
"a": 13,
28+
"d": 0
29+
},
30+
"mne/utils/config.py": {
31+
"a": 6,
32+
"d": 1
33+
}
34+
}
35+
}

0 commit comments

Comments
 (0)