Merged
Conversation
for more information, see https://pre-commit.ci
…python into report_add_image_kwargs cannot push without merging upstream
Co-authored-by: Richard Höchenberger <richard.hoechenberger@gmail.com>
…-python into report_add_image_kwargs asked to merge upstream before pushing
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
larsoner
reviewed
Feb 20, 2024
* upstream/main: [pre-commit.ci] pre-commit autoupdate (mne-tools#12453) MAINT: Fix CIs for PyQt6 (mne-tools#12452) DOC: add missing info to interpolate bads docstring (mne-tools#12448) FIX: na_rep for reports (mne-tools#12447) ENH: Multiple raw instance support to head pos average (mne-tools#12445) ENH: Add image_kwargs to report.add_epochs (mne-tools#12443)
larsoner
approved these changes
Feb 20, 2024
Member
larsoner
left a comment
There was a problem hiding this comment.
Just fixed a merge conflict and added a little check, let me know if you agree with the changes @SophieHerbst and I'll merge when green!
hoechenberger
approved these changes
Feb 22, 2024
snwnde
pushed a commit
to snwnde/mne-python
that referenced
this pull request
Mar 20, 2024
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Richard Höchenberger <richard.hoechenberger@gmail.com> Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Needed for issue #848
Define image_kwargs per channel type for plotting epochs image in report.add_epochs