-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into dev-report-src
- Loading branch information
Showing
54 changed files
with
2,057 additions
and
191 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Fix bug when loading certain EEGLAB files that do not contain a ``nodatchans`` field, by `Clemens Brunner`_. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Do not convert the first "New Segment" marker in a BrainVision file to an annotation, as it only contains the recording date (which is already available in ``info["meas_date"]``), by `Clemens Brunner`_. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Take units (m or mm) into account when drawing :func:`~mne.viz.plot_evoked_field` on top of :class:`~mne.viz.Brain`, by `Marijn van Vliet`_. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| { | ||
| "merge_commit_sha": "aca49655b10fc17679142e07c5d46659be1099da", | ||
| "authors": [ | ||
| { | ||
| "n": "Marijn van Vliet", | ||
| "e": "w.m.vanvliet@gmail.com" | ||
| }, | ||
| { | ||
| "n": "pre-commit-ci[bot]", | ||
| "e": "66853113+pre-commit-ci[bot]@users.noreply.github.com" | ||
| }, | ||
| { | ||
| "n": "Daniel McCloy", | ||
| "e": "dan@mccloy.info" | ||
| } | ||
| ], | ||
| "changes": { | ||
| "doc/changes/devel/12071.newfeature.rst": { | ||
| "a": 1, | ||
| "d": 0 | ||
| }, | ||
| "mne/epochs.py": { | ||
| "a": 2, | ||
| "d": 0 | ||
| }, | ||
| "mne/evoked.py": { | ||
| "a": 2, | ||
| "d": 0 | ||
| }, | ||
| "mne/viz/_figure.py": { | ||
| "a": 3, | ||
| "d": 3 | ||
| }, | ||
| "mne/viz/_mpl_figure.py": { | ||
| "a": 1, | ||
| "d": 1 | ||
| }, | ||
| "mne/viz/evoked.py": { | ||
| "a": 12, | ||
| "d": 1 | ||
| }, | ||
| "mne/viz/tests/test_raw.py": { | ||
| "a": 14, | ||
| "d": 25 | ||
| }, | ||
| "mne/viz/tests/test_topo.py": { | ||
| "a": 35, | ||
| "d": 1 | ||
| }, | ||
| "mne/viz/tests/test_utils.py": { | ||
| "a": 69, | ||
| "d": 0 | ||
| }, | ||
| "mne/viz/topo.py": { | ||
| "a": 81, | ||
| "d": 15 | ||
| }, | ||
| "mne/viz/ui_events.py": { | ||
| "a": 20, | ||
| "d": 0 | ||
| }, | ||
| "mne/viz/utils.py": { | ||
| "a": 108, | ||
| "d": 63 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "merge_commit_sha": "3c6a054093d305a98757a97398e5e34988a3aced", | ||
| "authors": [ | ||
| { | ||
| "n": "Qian Chu", | ||
| "e": null | ||
| } | ||
| ], | ||
| "changes": { | ||
| "doc/changes/devel/12656.bugfix.rst": { | ||
| "a": 1, | ||
| "d": 0 | ||
| }, | ||
| "mne/export/_brainvision.py": { | ||
| "a": 7, | ||
| "d": 0 | ||
| }, | ||
| "mne/export/_edf.py": { | ||
| "a": 4, | ||
| "d": 1 | ||
| }, | ||
| "mne/export/_eeglab.py": { | ||
| "a": 11, | ||
| "d": 5 | ||
| }, | ||
| "mne/export/_export.py": { | ||
| "a": 7, | ||
| "d": 1 | ||
| }, | ||
| "mne/export/tests/test_export.py": { | ||
| "a": 82, | ||
| "d": 7 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| { | ||
| "merge_commit_sha": "176f64ff061136cf5628d76535a8d7e2e164d399", | ||
| "authors": [ | ||
| { | ||
| "n": "Shristi Baral", | ||
| "e": null | ||
| }, | ||
| { | ||
| "n": "shristi", | ||
| "e": "shristi.baral@aalto.fi" | ||
| }, | ||
| { | ||
| "n": "Eric Larson", | ||
| "e": "larson.eric.d@gmail.com" | ||
| }, | ||
| { | ||
| "n": "Daniel McCloy", | ||
| "e": "dan@mccloy.info" | ||
| } | ||
| ], | ||
| "changes": { | ||
| "doc/changes/devel/12828.bugfix.rst": { | ||
| "a": 1, | ||
| "d": 0 | ||
| }, | ||
| "doc/changes/names.inc": { | ||
| "a": 1, | ||
| "d": 0 | ||
| }, | ||
| "mne/source_estimate.py": { | ||
| "a": 7, | ||
| "d": 0 | ||
| }, | ||
| "mne/utils/docs.py": { | ||
| "a": 6, | ||
| "d": 0 | ||
| }, | ||
| "mne/viz/_3d.py": { | ||
| "a": 13, | ||
| "d": 3 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| { | ||
| "merge_commit_sha": "1d2635f84a55785c3531cfe4027eda3820a7fb31", | ||
| "authors": [ | ||
| { | ||
| "n": "Thomas S. Binns", | ||
| "e": "t.s.binns@outlook.com" | ||
| }, | ||
| { | ||
| "n": "Daniel McCloy", | ||
| "e": "dan@mccloy.info" | ||
| }, | ||
| { | ||
| "n": "Eric Larson", | ||
| "e": "larson.eric.d@gmail.com" | ||
| } | ||
| ], | ||
| "changes": { | ||
| "doc/changes/devel/12910.newfeature.rst": { | ||
| "a": 1, | ||
| "d": 0 | ||
| }, | ||
| "mne/time_frequency/multitaper.py": { | ||
| "a": 10, | ||
| "d": 0 | ||
| }, | ||
| "mne/time_frequency/tests/test_tfr.py": { | ||
| "a": 195, | ||
| "d": 26 | ||
| }, | ||
| "mne/time_frequency/tfr.py": { | ||
| "a": 249, | ||
| "d": 113 | ||
| }, | ||
| "mne/utils/docs.py": { | ||
| "a": 12, | ||
| "d": 0 | ||
| }, | ||
| "mne/utils/numerics.py": { | ||
| "a": 3, | ||
| "d": 0 | ||
| }, | ||
| "mne/viz/tests/test_topomap.py": { | ||
| "a": 24, | ||
| "d": 1 | ||
| }, | ||
| "mne/viz/topomap.py": { | ||
| "a": 13, | ||
| "d": 1 | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.