Skip to content

Conversation

@larsoner
Copy link
Member

@larsoner larsoner commented Jul 1, 2024

Closes #12693

Also fixes the one legitimate failure from this month's linkcheck run

@larsoner larsoner added the backport-candidate on-merge: backport to maint/1.11 label Jul 1, 2024
@larsoner
Copy link
Member Author

larsoner commented Jul 1, 2024

@mscheltienne feel free to mark for merge-when-green if you're happy

@mscheltienne mscheltienne enabled auto-merge (squash) July 1, 2024 16:38
@mscheltienne
Copy link
Member

LGTM, thanks @larsoner

@Karia70 Fix will be available in the next release.

@mscheltienne mscheltienne merged commit 31ef32e into mne-tools:main Jul 1, 2024
@lumberbot-app
Copy link

lumberbot-app bot commented Jul 1, 2024

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout maint/1.7
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 31ef32efb478b6ee32669c5b50196114c13d2443
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #12694: BUG: Fix bug with CSP rank="full"'
  1. Push to a named branch:
git push YOURFORK maint/1.7:auto-backport-of-pr-12694-on-maint/1.7
  1. Create a PR against branch maint/1.7, I would have named this PR:

"Backport PR #12694 on branch maint/1.7 (BUG: Fix bug with CSP rank="full")"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@larsoner larsoner deleted the csp branch July 1, 2024 16:47
larsoner added a commit to larsoner/mne-python that referenced this pull request Jul 1, 2024
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
larsoner added a commit that referenced this pull request Jul 1, 2024
…ull") (#12695)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
@larsoner larsoner added backported and removed backport-candidate on-merge: backport to maint/1.11 Still Needs Manual Backport labels Jul 1, 2024
larsoner added a commit to scott-huberty/mne-python that referenced this pull request Jul 16, 2024
* upstream/main: (252 commits)
  Disable the "Back to top" button in the documentation (mne-tools#12688)
  DOC: match_channel_orders works on Epochs and Evoked, too (mne-tools#12699)
  Scale points and labels in montage plot (mne-tools#12703)
  Add license header to mne.stats.erp (mne-tools#12712)
  Update license year to 2024 (mne-tools#12713)
  Add standardized measurement error (SME) (mne-tools#12707)
  ENH: Parallel example execution in doc build (mne-tools#12708)
  MAINT: Update PR template (mne-tools#12692)
  MAINT: Fix doc build (mne-tools#12706)
  [pre-commit.ci] pre-commit autoupdate (mne-tools#12702)
  Improve documentation of ylim argument through Evoked plotting function (mne-tools#12697)
  [pre-commit.ci] pre-commit autoupdate (mne-tools#12696)
  BUG: Fix bug with CSP rank="full" (mne-tools#12694)
  MRG: Add epochs metadata summary to HTML representation (mne-tools#12686)
  Correct `Epochs.apply_function` docstring (mne-tools#12691)
  FIX: Gracefully handle missing datetime in Eyelink File (mne-tools#12687)
  MAINT: Restore SciPy pre (mne-tools#12689)
  Enh single channel annotation (mne-tools#12669)
  [pre-commit.ci] pre-commit autoupdate (mne-tools#12682)
  Bump autofix-ci/action from 1.2 to 1.3 in the actions group (mne-tools#12681)
  ...
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.

Parameter 'rank' in CSP definition did not accept str in MNE 1.7.1

2 participants