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

Simplify #10619 #10620

Merged
merged 1 commit into from
May 11, 2022
Merged

Simplify #10619 #10620

merged 1 commit into from
May 11, 2022

Conversation

hoechenberger
Copy link
Member

cc @agramfort @alexrockhill

This simplifies #10619 via @agramfort's proposal

@hoechenberger hoechenberger added the backport-candidate on-merge: backport to maint/1.7 label May 11, 2022
@hoechenberger
Copy link
Member Author

Once merged, should be backported together with #10619

@hoechenberger hoechenberger merged commit 7b34565 into mne-tools:main May 11, 2022
hoechenberger added a commit to hoechenberger/mne-python that referenced this pull request May 11, 2022
@hoechenberger hoechenberger deleted the simplify-10619 branch May 11, 2022 08:43
larsoner added a commit that referenced this pull request May 11, 2022
* Drop EEG rejection thresholds when replacing EEG with CSD channels (#10619)

* Drop EEG rejection thresholds when replacing EEG with CSD channels

This is an attempt to fix the issue reported at
https://mne.discourse.group/t/saving-epoch-error-no-eeg-channel-found

* fix, working version

* Update doc/changes/latest.inc

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

Co-authored-by: Alex <aprockhill@mailbox.org>

* Simplify #10619 (#10620)

* MAINT: Fix

* FIX: Fix for regression

* FIX: Fix for pandas

* FIX: Better fix

* FIX: Adjust

Co-authored-by: Alex <aprockhill@mailbox.org>
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
larsoner added a commit to HanBnrd/mne-python that referenced this pull request May 17, 2022
* upstream/main: (24 commits)
  Use less memory when loading EDF file (mne-tools#10638)
  BUG: fix ipython console accessibility after MNEQtBrowser in Spyder (mne-tools#10637)
  WIP: Fix mne.time_frequency.multitaper Nyquist adjustment slightly incorrect (mne-tools#10541)
  BUG: Fix bug with fNIRS reordering (mne-tools#10630)
  MNT: PyQt6 for pip pre 3.10 (mne-tools#10636)
  CI: Fix conda (mne-tools#10628)
  MRG: Update installer links to point to 1.0.3_0 (mne-tools#10622)
  [BUG, MRG] fix info write access (mne-tools#10626)
  [MRG] Fixed group_by titles in evoked_plot. (mne-tools#10618)
  [BUG, MRG] Replace image_interp with interpolation in topomap plot arguments (mne-tools#10617)
  MAINT: Fix timeout (mne-tools#10624)
  Simplify mne-tools#10619 (mne-tools#10620)
  Drop EEG rejection thresholds when replacing EEG with CSD channels (mne-tools#10619)
  Add get_montage support for fNIRS (mne-tools#10611)
  ENH: Improve make_head_surface options (mne-tools#10592)
  [ENH, MRG] Add citation for intracranial JOSS paper (mne-tools#10616)
  [ENH] Add sys info for mne-icalabel (mne-tools#10615)
  MRG: Add "highlight" parameter to Evoked.plot() to conveniently highlight time periods (mne-tools#10614)
  MRG: Allow to pass array of "average" values to plot_evoked_topomap() (mne-tools#10610)
  fix: snirf length units (mne-tools#10613)
  ...
@hoechenberger hoechenberger added backported and removed backport-candidate on-merge: backport to maint/1.7 labels Jun 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant