Skip to content

Conversation

@larsoner
Copy link
Member

@larsoner larsoner commented Dec 4, 2023

No description provided.

# don't allow complex output
psd_funcs = dict(welch=psd_array_welch, multitaper=psd_array_multitaper)
if method_kw.get("output", "") == "complex":
warn(
Copy link
Member Author

Choose a reason for hiding this comment

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

@drammock wasn't sure if there was additional code we could remove from spectrum now that we do not support complex output. Can you push if so?

Copy link
Member

Choose a reason for hiding this comment

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

ha, luckily I had kept the old branch around so I just had to cherry-pick and resolve a couple small conflicts

@drammock
Copy link
Member

drammock commented Dec 4, 2023

hmm circleci and pip-pre are failing at check-Qt step, and ultraslow is failing at print_config (?!).

@larsoner
Copy link
Member Author

larsoner commented Dec 4, 2023

Need a merge with main which I'll do now

@larsoner larsoner enabled auto-merge (squash) December 5, 2023 00:37
@larsoner larsoner merged commit 6187c83 into mne-tools:main Dec 5, 2023
@larsoner larsoner deleted the dep branch December 5, 2023 00:57
larsoner added a commit to hoechenberger/mne-python that referenced this pull request Dec 5, 2023
* upstream/main:
  MRG: Use ruff-format instead of Black (mne-tools#12261)
  MAINT: Make selenium optional and use on CircleCI (mne-tools#12263)
  MAINT: Post-release deprecations (mne-tools#12265)
  MAINT: Replace `Path.parent.parent` with `Path.parents[N]` in tests (mne-tools#12257)
snwnde pushed a commit to snwnde/mne-python that referenced this pull request Mar 20, 2024
Co-authored-by: Daniel McCloy <dan@mccloy.info>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants