Skip to content

Commit 2ee1b0c

Browse files
shresth-kesharishresth-keshari
authored
Merge branch 'mne-tools:main' into gsoc_commits
2 parents 7a401c4 + e65a559 commit 2ee1b0c

File tree

20 files changed

+515
-6
lines changed

20 files changed

+515
-6
lines changed

‎doc/conf.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -646,23 +646,25 @@ def fix_sklearn_inherited_docstrings(app, what, name, obj, options, lines):
646646
"https://doi.org/10.1002/", # onlinelibrary.wiley.com/doi/10.1002/hbm
647647
"https://doi.org/10.1016/", # neuroimage
648648
"https://doi.org/10.1021/", # pubs.acs.org/doi/abs
649+
"https://doi.org/10.1063/", # pubs.aip.org/aip/jap
649650
"https://doi.org/10.1073/", # pnas.org
651+
"https://doi.org/10.1080/", # www.tandfonline.com
652+
"https://doi.org/10.1088/", # www.tandfonline.com
650653
"https://doi.org/10.1093/", # academic.oup.com/sleep/
651654
"https://doi.org/10.1098/", # royalsocietypublishing.org
652655
"https://doi.org/10.1101/", # www.biorxiv.org
653656
"https://doi.org/10.1103", # journals.aps.org/rmp
654657
"https://doi.org/10.1111/", # onlinelibrary.wiley.com/doi/10.1111/psyp
655658
"https://doi.org/10.1126/", # www.science.org
656659
"https://doi.org/10.1137/", # epubs.siam.org
660+
"https://doi.org/10.1145/", # dl.acm.org
657661
"https://doi.org/10.1155/", # www.hindawi.com/journals/cin
658662
"https://doi.org/10.1161/", # www.ahajournals.org
659663
"https://doi.org/10.1162/", # direct.mit.edu/neco/article/
660664
"https://doi.org/10.1167/", # jov.arvojournals.org
661665
"https://doi.org/10.1177/", # journals.sagepub.com
662-
"https://doi.org/10.1063/", # pubs.aip.org/aip/jap
663-
"https://doi.org/10.1080/", # www.tandfonline.com
664-
"https://doi.org/10.1088/", # www.tandfonline.com
665666
"https://doi.org/10.3109/", # www.tandfonline.com
667+
"https://www.biorxiv.org/content/10.1101/", # biorxiv.org
666668
"https://www.researchgate.net/profile/",
667669
"https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html",
668670
r"https://scholar.google.com/scholar\?cites=12188330066413208874&as_ylo=2014",
@@ -682,6 +684,7 @@ def fix_sklearn_inherited_docstrings(app, what, name, obj, options, lines):
682684
"https://www.cea.fr",
683685
"http://www.humanconnectome.org/data",
684686
"https://www.mail-archive.com/[email protected]",
687+
"https://launchpad.net",
685688
# Max retries exceeded
686689
"https://doi.org/10.7488/ds/1556",
687690
"https://datashare.is.ed.ac.uk/handle/10283",

‎doc/sphinxext/prs/13135.json‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
{
2+
"merge_commit_sha": "4cce83f50a1086dd3ff5642f45f9e971ec858fa2",
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": "[email protected]"
11+
}
12+
],
13+
"changes": {
14+
"doc/conf.py": {
15+
"a": 1,
16+
"d": 0
17+
},
18+
"doc/sphinxext/credit_tools.py": {
19+
"a": 2,
20+
"d": 1
21+
},
22+
"doc/sphinxext/prs/13044.json": {
23+
"a": 47,
24+
"d": 0
25+
},
26+
"doc/sphinxext/prs/13080.json": {
27+
"a": 63,
28+
"d": 0
29+
},
30+
"doc/sphinxext/prs/13083.json": {
31+
"a": 39,
32+
"d": 0
33+
},
34+
"doc/sphinxext/prs/13093.json": {
35+
"a": 187,
36+
"d": 0
37+
},
38+
"doc/sphinxext/prs/13097.json": {
39+
"a": 23,
40+
"d": 0
41+
},
42+
"doc/sphinxext/prs/13099.json": {
43+
"a": 15,
44+
"d": 0
45+
},
46+
"doc/sphinxext/prs/13100.json": {
47+
"a": 23,
48+
"d": 0
49+
},
50+
"doc/sphinxext/prs/13101.json": {
51+
"a": 35,
52+
"d": 0
53+
},
54+
"doc/sphinxext/prs/13104.json": {
55+
"a": 19,
56+
"d": 0
57+
},
58+
"doc/sphinxext/prs/13106.json": {
59+
"a": 19,
60+
"d": 0
61+
},
62+
"doc/sphinxext/prs/13107.json": {
63+
"a": 27,
64+
"d": 0
65+
},
66+
"doc/sphinxext/prs/13110.json": {
67+
"a": 15,
68+
"d": 0
69+
},
70+
"doc/sphinxext/prs/13113.json": {
71+
"a": 31,
72+
"d": 0
73+
},
74+
"doc/sphinxext/prs/13114.json": {
75+
"a": 39,
76+
"d": 0
77+
},
78+
"doc/sphinxext/prs/13116.json": {
79+
"a": 15,
80+
"d": 0
81+
},
82+
"doc/sphinxext/prs/13123.json": {
83+
"a": 27,
84+
"d": 0
85+
},
86+
"doc/sphinxext/prs/13125.json": {
87+
"a": 19,
88+
"d": 0
89+
},
90+
"doc/sphinxext/prs/13126.json": {
91+
"a": 15,
92+
"d": 0
93+
},
94+
"doc/sphinxext/prs/13129.json": {
95+
"a": 31,
96+
"d": 0
97+
},
98+
"doc/sphinxext/prs/13132.json": {
99+
"a": 31,
100+
"d": 0
101+
},
102+
"doc/sphinxext/prs/13134.json": {
103+
"a": 15,
104+
"d": 0
105+
}
106+
}
107+
}

‎doc/sphinxext/prs/13140.json‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"merge_commit_sha": "1fe211a7b70d30cb1bb0c8eaa195469c1df2616f",
3+
"authors": [
4+
{
5+
"n": "Eric Larson",
6+
"e": "[email protected]"
7+
}
8+
],
9+
"changes": {
10+
"doc/sphinxext/mne_doc_utils.py": {
11+
"a": 27,
12+
"d": 106
13+
},
14+
"mne/event.py": {
15+
"a": 1,
16+
"d": 0
17+
},
18+
"mne/io/eyelink/_utils.py": {
19+
"a": 9,
20+
"d": 2
21+
},
22+
"mne/io/eyelink/tests/test_eyelink.py": {
23+
"a": 4,
24+
"d": 0
25+
},
26+
"tutorials/preprocessing/90_eyetracking_data.py": {
27+
"a": 2,
28+
"d": 2
29+
}
30+
}
31+
}

‎doc/sphinxext/prs/13141.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"merge_commit_sha": "266ccc9540f159609976fc6e1b2259c93923b2e3",
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/13143.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"merge_commit_sha": "73c4a7cb844a13377ce68f31d7d5dec822067986",
3+
"authors": [
4+
{
5+
"n": "Daniel McCloy",
6+
"e": null
7+
}
8+
],
9+
"changes": {
10+
"doc/_includes/forward.rst": {
11+
"a": 6,
12+
"d": 6
13+
},
14+
"doc/documentation/cookbook.rst": {
15+
"a": 1,
16+
"d": 4
17+
}
18+
}
19+
}

‎doc/sphinxext/prs/13145.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"merge_commit_sha": "a5073bf977b73e9981a2222cc546c93081914a7d",
3+
"authors": [
4+
{
5+
"n": "Scott Huberty",
6+
"e": null
7+
}
8+
],
9+
"changes": {
10+
"doc/changes/devel/13145.bugfix.rst": {
11+
"a": 1,
12+
"d": 0
13+
},
14+
"mne/io/egi/events.py": {
15+
"a": 9,
16+
"d": 3
17+
},
18+
"mne/io/egi/tests/test_egi.py": {
19+
"a": 13,
20+
"d": 0
21+
}
22+
}
23+
}

‎doc/sphinxext/prs/13146.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"merge_commit_sha": "e7a593add4bbda513cff94f8ba7a1166919dc376",
3+
"authors": [
4+
{
5+
"n": "Scott Huberty",
6+
"e": null
7+
},
8+
{
9+
"n": "Eric Larson",
10+
"e": "[email protected]"
11+
}
12+
],
13+
"changes": {
14+
"mne/forward/forward.py": {
15+
"a": 3,
16+
"d": 3
17+
},
18+
"mne/viz/backends/tests/test_abstract.py": {
19+
"a": 1,
20+
"d": 1
21+
}
22+
}
23+
}

‎doc/sphinxext/prs/13147.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"merge_commit_sha": "be27cf8dd32922ba6e15599f7746da635e9856c0",
3+
"authors": [
4+
{
5+
"n": "Eric Larson",
6+
"e": "[email protected]"
7+
}
8+
],
9+
"changes": {
10+
"mne/parallel.py": {
11+
"a": 15,
12+
"d": 0
13+
},
14+
"mne/tests/test_filter.py": {
15+
"a": 10,
16+
"d": 3
17+
}
18+
}
19+
}

‎doc/sphinxext/prs/13148.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"merge_commit_sha": "7c531e49aa46083efd507921fe53a6ac0c89de49",
3+
"authors": [
4+
{
5+
"n": "Scott Huberty",
6+
"e": null
7+
}
8+
],
9+
"changes": {
10+
"mne/io/egi/egimff.py": {
11+
"a": 9,
12+
"d": 9
13+
},
14+
"mne/io/egi/tests/test_egi.py": {
15+
"a": 4,
16+
"d": 1
17+
}
18+
}
19+
}

‎doc/sphinxext/prs/13149.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"merge_commit_sha": "2cdc4af85a7d352f4e277a898b6fb118fc286233",
3+
"authors": [
4+
{
5+
"n": "Stefan Appelhoff",
6+
"e": "[email protected]"
7+
},
8+
{
9+
"n": "Eric Larson",
10+
"e": "[email protected]"
11+
}
12+
],
13+
"changes": {
14+
"mne/_fiff/meas_info.py": {
15+
"a": 1,
16+
"d": 0
17+
},
18+
"mne/dipole.py": {
19+
"a": 13,
20+
"d": 5
21+
}
22+
}
23+
}

0 commit comments

Comments
 (0)