Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BUG: Fix annot meas_date / crop #10491

Merged
merged 12 commits into from
Apr 21, 2022
Merged

BUG: Fix annot meas_date / crop #10491

merged 12 commits into from
Apr 21, 2022

Conversation

larsoner
Copy link
Member

@larsoner larsoner commented Apr 4, 2022

Closes #10490

So far just replicates the problem. True TDD time!

@hoechenberger
Copy link
Member

Is this related to #10490?

@larsoner
Copy link
Member Author

Is this related to #10490?

From the PR description:

Closes #10490

So yes someday I hope it will close that one :)

@hoechenberger
Copy link
Member

Whoops 😅

@larsoner larsoner changed the title WIP: Fix annot meas_date / crop BUG: Fix annot meas_date / crop Apr 20, 2022
@larsoner
Copy link
Member Author

Ready for review/merge @agramfort @hoechenberger

Copy link
Member

@hoechenberger hoechenberger left a comment

Choose a reason for hiding this comment

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

As far as I can tell, looks good! I suggested slight rephrasing in two places

doc/changes/latest.inc Outdated Show resolved Hide resolved
mne/annotations.py Outdated Show resolved Hide resolved
Co-authored-by: Richard Höchenberger <richard.hoechenberger@gmail.com>
Copy link
Member

@agramfort agramfort left a comment

Choose a reason for hiding this comment

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

thx a ton @larsoner !

@agramfort agramfort merged commit 2f53da7 into mne-tools:main Apr 21, 2022
agramfort added a commit that referenced this pull request Apr 21, 2022
* WIP: Fix annot meas_date / crop

* WIP: Another bad thing

* WIP: Doc

* MNT: [ci skip]

* FIX: Noop works

* FIX: Got it

* DOC: Latest

* FIX: Flake

* FIX: Even better

* STY: Sp

* DOC: RST

* Apply suggestions from code review

Co-authored-by: Richard Höchenberger <richard.hoechenberger@gmail.com>

Co-authored-by: Alexandre Gramfort <alexandre.gramfort@m4x.org>
Co-authored-by: Richard Höchenberger <richard.hoechenberger@gmail.com>
@agramfort
Copy link
Member

backported to maint/1.0

@larsoner larsoner deleted the annot2 branch April 21, 2022 15:21
larsoner added a commit to agramfort/mne-python that referenced this pull request Apr 21, 2022
* upstream/main: (52 commits)
  MAINT: Extra test for coreg (mne-tools#10549)
  BUG: Fix annot meas_date / crop (mne-tools#10491)
  Update latest.inc
  Use liblinear solver instead of lbgfs in all decodung examples [skip azp][skip actions] (mne-tools#10552)
  STY: Hotfix for HTML [ci skip]
  Allow making inverse solutions from fixed-orientation discrete forward models, enabling multi-dipole modeling (mne-tools#10464)
  Correct documented default number of CV splits [skip azp][skip actions] (mne-tools#10548)
  MRG: Add error checking to prevent the creation of montage with invalid [x, y, z] (mne-tools#10547)
  MRG: Add "verbose" parameter to pick_channels() method (mne-tools#10544)
  CI: Avoid bad PySide6 (mne-tools#10545)
  FIX: Flake (mne-tools#10540)
  FIX: Correct link (mne-tools#10536)
  DOC: Update installers (mne-tools#10535)
  ENH: Add dark mode to website (mne-tools#10523)
  WIP: Copy BEM surfaces by default (don't symlink) (mne-tools#10531)
  Avoid lowpass=0 in brainvision data (mne-tools#10517)
  DOC: Update installers [skip azp] [skip actions] (mne-tools#10528)
  FIX: Fix for old build (mne-tools#10527)
  Fix line noise at wrong frequencies (mne-tools#10525)
  FIX : read fids in eeglab (mne-tools#10521)
  ...
larsoner added a commit to alexrockhill/mne-python that referenced this pull request Apr 21, 2022
* upstream/main:
  MAINT: Extra test for coreg (mne-tools#10549)
  BUG: Fix annot meas_date / crop (mne-tools#10491)
  Update latest.inc
  Use liblinear solver instead of lbgfs in all decodung examples [skip azp][skip actions] (mne-tools#10552)
  STY: Hotfix for HTML [ci skip]
  Allow making inverse solutions from fixed-orientation discrete forward models, enabling multi-dipole modeling (mne-tools#10464)
larsoner added a commit to hoechenberger/mne-python that referenced this pull request Apr 21, 2022
…10533

* upstream/main:
  MAINT: Extra test for coreg (mne-tools#10549)
  BUG: Fix annot meas_date / crop (mne-tools#10491)
  Update latest.inc
larsoner added a commit to hoechenberger/mne-python that referenced this pull request Apr 21, 2022
…10520

* upstream/main:
  MAINT: Extra test for coreg (mne-tools#10549)
  BUG: Fix annot meas_date / crop (mne-tools#10491)
  Update latest.inc
  Use liblinear solver instead of lbgfs in all decodung examples [skip azp][skip actions] (mne-tools#10552)
  STY: Hotfix for HTML [ci skip]
  Allow making inverse solutions from fixed-orientation discrete forward models, enabling multi-dipole modeling (mne-tools#10464)
  Correct documented default number of CV splits [skip azp][skip actions] (mne-tools#10548)
  MRG: Add error checking to prevent the creation of montage with invalid [x, y, z] (mne-tools#10547)
  MRG: Add "verbose" parameter to pick_channels() method (mne-tools#10544)
  CI: Avoid bad PySide6 (mne-tools#10545)
@larsoner larsoner added the EOSS4 label Jul 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BUG raw.crop with first_samp != 0 and annotations
3 participants