MRG, FIX: Fix bug with metadata and event_repeated#7733
Merged
larsoner merged 1 commit intomne-tools:masterfrom May 29, 2020
Merged
MRG, FIX: Fix bug with metadata and event_repeated#7733larsoner merged 1 commit intomne-tools:masterfrom
larsoner merged 1 commit intomne-tools:masterfrom
Conversation
Codecov Report
@@ Coverage Diff @@
## master #7733 +/- ##
==========================================
- Coverage 90.36% 90.22% -0.15%
==========================================
Files 459 455 -4
Lines 84942 84646 -296
Branches 13459 13415 -44
==========================================
- Hits 76762 76371 -391
- Misses 5321 5406 +85
- Partials 2859 2869 +10 |
Member
|
The I would still recommend to add the repeated_events='ignore' option, but this is also separate. Else LGTM |
Member
Author
Indeed, maybe we should not allow merging when metadata is present.
Let's leave #7732 open to track and discuss this (it's why I didn't add the "closes" tag to the PR description) |
larsoner
added a commit
to larsoner/mne-python
that referenced
this pull request
Jun 5, 2020
* upstream/master: DOC: Order added reference FIX: Working working version ENH: More efficient actually working csd, needs review MAINT: Update dataset and add constant test (mne-tools#7866) DOC: update link to glasser supplementary info; convert to footbib (mne-tools#7864) FIX: Fix subtract_evoked with decim (mne-tools#7855) FIX: Fix reading of old TFRs (mne-tools#7851) DOC: Add evoked movecomp to example (mne-tools#7852) Deprecate meg=True in pick_types (mne-tools#7823) ENH: Allow reading broken file (mne-tools#7846) MRG, ENH: Add mixed source estimate support to compute_source_morph (mne-tools#7734) FIX: Fix bug with metadata and event_repeated (mne-tools#7733) MRG, ENH: Add axes to plot_evoked_white (mne-tools#7831) MRG, ENH: Add example of projection to source space (mne-tools#7705)
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
2 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.
Addresses the first part of #7732
@kingjr can you try it?