Skip to content

Conversation

@larsoner
Copy link
Member

Should fix https://app.circleci.com/pipelines/github/mne-tools/mne-python/26504/workflows/03a5e08f-d5f2-43ea-ab4e-30a54cb66291/jobs/71241, and removes a crufty print that I accidentally left in a previous PR 🤦

@larsoner larsoner added backport-candidate on-merge: backport to maint/1.11 no-changelog-entry-needed labels Jan 22, 2025
@larsoner larsoner enabled auto-merge (squash) January 22, 2025 16:46
@larsoner larsoner merged commit 6028982 into mne-tools:main Jan 22, 2025
30 checks passed
@larsoner larsoner deleted the dep branch January 22, 2025 18:21
meeseeksmachine pushed a commit to meeseeksmachine/mne-python that referenced this pull request Jan 22, 2025
larsoner added a commit that referenced this pull request Jan 22, 2025
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
larsoner added a commit to larsoner/mne-python that referenced this pull request Jan 24, 2025
* upstream/main: (57 commits)
  Allow lasso selection sensors in a plot_evoked_topo (mne-tools#12071)
  MAINT: Fix doc build (mne-tools#13076)
  BUG: Improve sklearn compliance (mne-tools#13065)
  [pre-commit.ci] pre-commit autoupdate (mne-tools#13073)
  MAINT: Add Numba to 3.13 test (mne-tools#13075)
  Bump autofix-ci/action from ff86a557419858bb967097bfc916833f5647fa8c to 551dded8c6cc8a1054039c8bc0b8b48c51dfc6ef in the actions group (mne-tools#13071)
  [BUG] Correct annotation onset for exportation to EDF and EEGLAB (mne-tools#12656)
  New feature for removing heart artifacts from EEG or ESG data using a Principal Component Analysis - Optimal Basis Sets (PCA-OBS) algorithm (mne-tools#13037)
  [BUG] Fix taper weighting in computation of TFR multitaper power (mne-tools#13067)
  [FIX] Reading an EDF with preload=False and mixed frequency (mne-tools#13069)
  Fix evoked topomap colorbars, closes mne-tools#13050 (mne-tools#13063)
  [pre-commit.ci] pre-commit autoupdate (mne-tools#13060)
  BUG: Fix bug with interval calculation (mne-tools#13062)
  [DOC] extend documentation for add_channels (mne-tools#13051)
  Add `combine_tfr` to API (mne-tools#13054)
  Add `combine_spectrum()` function and allow `grand_average()` to support `Spectrum` data (mne-tools#13058)
  BUG: Fix bug with helium anon (mne-tools#13056)
  [ENH] Add option to store and return TFR taper weights (mne-tools#12910)
  BUG: viz plot window's 'title' argument showed no effect. (mne-tools#12828)
  MAINT: Ensure limited set of tests are skipped (mne-tools#13053)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-candidate on-merge: backport to maint/1.11 no-changelog-entry-needed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant