Skip to content

bring mne-opm up to date with base package - #2

Merged
harrisonritz merged 146 commits into
harrisonritz:mne-opmfrom
mne-tools:main
May 27, 2026
Merged

harrisonritz merged 146 commits into
harrisonritz:mne-opmfrom
mne-tools:main

Conversation

@harrisonritz

Copy link
Copy Markdown
Owner

No description provided.

pre-commit-ci Bot and others added 30 commits February 10, 2026 16:42
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Daniel McCloy <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Marijn van Vliet <[email protected]>
Co-authored-by: Eric Larson <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: Carina Forster <[email protected]>
Co-authored-by: Thomas S. Binns <[email protected]>
Co-authored-by: Scott Huberty <[email protected]>
Co-authored-by: Erica Peterson <[email protected]>
Co-authored-by: Eric Larson <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: mne[bot] <[email protected]>
…ed (#13688)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Thomas S. Binns <[email protected]>
Co-authored-by: Daniel McCloy <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Scott Huberty <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Daniel McCloy <[email protected]>
Co-authored-by: Bru <[email protected]>
Co-authored-by: Stefan Appelhoff <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: Eric Larson <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: Eric Larson <[email protected]>
baris-talar and others added 28 commits May 1, 2026 15:04
…13584)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
…actions group (#13897)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: Eric Larson <[email protected]>
…n_t_test(). (#13813)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Erica R Peterson <[email protected]>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Eric Larson <[email protected]>
…actions group (#13901)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: mne[bot] <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Eric Larson <[email protected]>
Co-authored-by: Thomas S. Binns <[email protected]>
Co-authored-by: Daniel McCloy <[email protected]>
@harrisonritz
harrisonritz merged commit e059f50 into harrisonritz:mne-opm May 27, 2026
harrisonritz pushed a commit that referenced this pull request Oct 2, 2026
Merge performed against the true synchronization point (upstream commit
e4cb5ab, 2026-05-27) rather than git's computed merge-base (87d1051,
2026-02-09). The fork's "bring mne-opm up to date with base package (#2)"
commit was a squash, so git did not know upstream content up to e4cb5ab
was already present; using the computed merge-base produced ~187 spurious
conflicts (CI configs, docs, sphinxext JSON, ...). Against the true base the
merge is textually clean and carries only the fork's real changes:

 - maxwell_filter(st_only="ext") + related tests / docs
 - device_info-based helmet selection in _get_meg_system, bundled Cerca helmet
 - tools/import_helmet.py, tools/helmet_ch_pos_from_tsv.py
 - FIFF_UNIT_RAD unit name; eyegaze/pupil coil-type mapping in set_channel_types
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.