Skip to content

Conversation

@CarinaFo
Copy link
Contributor

@CarinaFo CarinaFo commented Nov 14, 2023

fixed #11776

mne.epoch.Epochs.equalize_epoch_counts allows EpochsTFR as inputs

@CarinaFo CarinaFo changed the title first draft implementation first draft implementation #11776 Nov 14, 2023
@CarinaFo CarinaFo changed the title first draft implementation #11776 equalize epoch counts for EpochsTFR #11776 Nov 14, 2023
@CarinaFo CarinaFo changed the title equalize epoch counts for EpochsTFR #11776 equalize epoch counts for EpochsTFR Nov 14, 2023
@CarinaFo CarinaFo changed the title equalize epoch counts for EpochsTFR equalize epoch counts for EpochsTFR #11776 Nov 14, 2023
@mscheltienne
Copy link
Member

+1 to move the drop method to a mixin inherited by BaseEpochs and by EpochsTFR.

@CarinaFo CarinaFo requested a review from larsoner as a code owner February 7, 2024 04:42
CarinaFo and others added 7 commits February 7, 2024 16:19
removing duplicate changelog entry. The number in the changelog filename should be the PR number, not the number of the issue that it fixes.
Notice the comments at the top of the file: 
"file generated by setuptools_scm; don't change, don't track in version control"
Copy link
Member

@drammock drammock left a comment

Choose a reason for hiding this comment

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

FYI I deleted 2 files: the duplicate changelog entry (the one that had the issue number in its filename) and the file mne/_version.py (which is auto-generated and isn't supposed to get committed to GitHub). Other than that just a few small suggestions that should hopefully get CIs to pass.

@drammock drammock changed the title equalize epoch counts for EpochsTFR #11776 equalize epoch counts for EpochsTFR Feb 7, 2024
@drammock
Copy link
Member

drammock commented Feb 7, 2024

@larsoner this one is all green and ready for a second pair of eyes.

@larsoner larsoner enabled auto-merge (squash) February 8, 2024 17:30
@larsoner larsoner disabled auto-merge February 8, 2024 17:30
@larsoner larsoner enabled auto-merge (squash) February 8, 2024 17:30
@CarinaFo
Copy link
Contributor Author

Should I wait for the auto-merge before I close the PR?

@drammock
Copy link
Member

Should I wait for the auto-merge before I close the PR?

Don't close the PR. It will automatically close when it's merged... But there are 2 failing tests that are preventing auto merge. I'll look tomorrow, they may be unrelated to this PR (and thus you wouldn't need to fix them here) but let's be sure

@larsoner larsoner merged commit 73ca06b into mne-tools:main Feb 13, 2024
@CarinaFo CarinaFo deleted the equalize_epochs_tfr branch February 14, 2024 00:42
snwnde pushed a commit to snwnde/mne-python that referenced this pull request Mar 20, 2024
Co-authored-by: Daniel McCloy <dan@mccloy.info>
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.

add equalize_event_counts method to EpochsTFR

4 participants