Skip to content

DOC: Fix changelog#13833

Merged
larsoner merged 10 commits intomne-tools:mainfrom
larsoner:log
Apr 10, 2026
Merged

DOC: Fix changelog#13833
larsoner merged 10 commits intomne-tools:mainfrom
larsoner:log

Conversation

@larsoner
Copy link
Copy Markdown
Member

@larsoner larsoner commented Apr 10, 2026 •
edited
Loading

Fix changelog and pip-pre (cc @tsbinns pushed a fix for it to get it in ASAP)

Closes #13828
Closes #13831

@larsoner larsoner added the backport-candidate on-merge: backport to maint/1.12 label Apr 10, 2026
larsoner
larsoner commented Apr 10, 2026
View reviewed changes
mne/gui/tests/test_coreg.py Outdated
Comment on lines +37 to +42
# PyVista <->NumPy 2.4
pytestmark = [
pytest.mark.filterwarnings(
"ignore:Setting the dtype on a NumPy array.*:RuntimeWarning"
),
]
Copy link
Copy Markdown
Member Author

@larsoner larsoner Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tsbinns if you copy these lines to the same spot in #13831 it should make it so you can continue without conflict

Copy link
Copy Markdown
Member Author

@larsoner larsoner Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... also, I opened pyvista/pyvista#8484

Copy link
Copy Markdown
Contributor

@tsbinns tsbinns Apr 10, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, just finished work. Thanks @larsoner!
Saw mne-tools/mne-installers#432 is merged and https://github.com/mne-tools/mne-installers/actions/runs/24248236486 is finished.
Worth still copying these lines to #13831 or just wait until tests here come back green and this gets merged?

Copy link
Copy Markdown
Contributor

@tsbinns tsbinns Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guess this will come back green first, so not much point doubling up with copying to #13831

@larsoner
Copy link
Copy Markdown
Member Author

larsoner commented Apr 10, 2026

This PR should actually wait until mne-tools/mne-installers#432 is in and I can cut a _1 of MNE-Installers. So #13831 should go in first actually and I'll update this PR if needed

@larsoner larsoner enabled auto-merge (squash) April 10, 2026 14:37
@larsoner
Copy link
Copy Markdown
Member Author

larsoner commented Apr 10, 2026

Cherry-picked commit from #13831. Will merge this PR if https://github.com/mne-tools/mne-installers/actions/runs/24248236486 finishes before that one is green 🏁

@larsoner larsoner disabled auto-merge April 10, 2026 14:39
@larsoner larsoner enabled auto-merge (squash) April 10, 2026 15:36
@larsoner larsoner disabled auto-merge April 10, 2026 15:36
@larsoner larsoner enabled auto-merge (squash) April 10, 2026 15:36
@larsoner larsoner mentioned this pull request Apr 10, 2026
Closed
@larsoner larsoner merged commit 852e8ff into mne-tools:main Apr 10, 2026
32 checks passed
@larsoner larsoner deleted the log branch April 10, 2026 17:16
@meeseeksmachine meeseeksmachine mentioned this pull request Apr 10, 2026
Merged
meeseeksmachine pushed a commit to meeseeksmachine/mne-python that referenced this pull request Apr 10, 2026
@larsoner @meeseeksmachine
Backport PR mne-tools#13833: DOC: Fix changelog
5f93633
larsoner added a commit that referenced this pull request Apr 10, 2026
@meeseeksmachine @larsoner
Backport PR #13833 on branch maint/1.12 [circle deploy] (DOC: Fix cha…
09fd56d 
…ngelog) (#13834)

Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tsbinns tsbinns tsbinns left review comments

@drammock drammock Awaiting requested review from drammock drammock is a code owner

@agramfort agramfort Awaiting requested review from agramfort agramfort is a code owner

Assignees

No one assigned

Labels

backport-candidate on-merge: backport to maint/1.12 no-changelog-entry-needed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

towncrier snafu on multiline changelog entry

2 participants

@larsoner @tsbinns