Skip to content

Conversation

@drammock
Copy link
Member

closes #11089

@larsoner in all but one case, a simple signature(f).parameters (or list(signature(f).parameters) was sufficient. IMO the helper function is not really needed, but if you disagree feel free to close this without merging.

@drammock
Copy link
Member Author

These failures passed for me locally... turns out I had scipy 1.8.x and they fail with 1.9.x. Will fix:

_________________________ test_ica_additional[picard] __________________________
mne/preprocessing/tests/test_ica.py:789: in test_ica_additional
    for name, func in get_score_funcs().items():
mne/preprocessing/ica.py:121: in get_score_funcs
    assert 'pearsonr' in score_funcs
E   AssertionError
_________________________ test_ica_additional[fastica] _________________________
mne/preprocessing/tests/test_ica.py:789: in test_ica_additional
    for name, func in get_score_funcs().items():
mne/preprocessing/ica.py:121: in get_score_funcs
    assert 'pearsonr' in score_funcs
E   AssertionError
_______________________________ test_ica_labels ________________________________
mne/preprocessing/tests/test_ica.py:1374: in test_ica_labels
    ica.find_bads_eog(raw, l_freq=None, h_freq=None)
<decorator-gen-447>:12: in find_bads_eog
    ???
mne/preprocessing/ica.py:1889: in find_bads_eog
    self.labels_['eog'], scores = self._find_bads_ch(
mne/preprocessing/ica.py:1376: in _find_bads_ch
    scores += [self.score_sources(
<decorator-gen-443>:12: in score_sources
    ???
mne/preprocessing/ica.py:1318: in score_sources
    scores = _find_sources(sources, target, score_func)
mne/preprocessing/ica.py:2367: in _find_sources
    score_func = get_score_funcs().get(score_func, score_func)
mne/preprocessing/ica.py:121: in get_score_funcs
    assert 'pearsonr' in score_funcs
E   AssertionError

@drammock
Copy link
Member Author

OK those tests pass locally now for me with scipy 1.8.0 and 1.9.1 so hopefully CIs are happy now

@agramfort
Copy link
Member

@britta-wstnr I let you click the auto-merge button if it's ok for you.

@larsoner larsoner added this to the 1.2 milestone Sep 30, 2022
@agramfort agramfort merged commit 880ec67 into mne-tools:main Oct 1, 2022
@agramfort
Copy link
Member

thx @drammock

larsoner added a commit to drammock/mne-python that referenced this pull request Oct 4, 2022
* upstream/main:
  Don't insert superfluous newlines in subprocess log messages (mne-tools#11219)
  purge _get_args helper func (mne-tools#11215)
larsoner added a commit to sappelhoff/mne-python that referenced this pull request Oct 4, 2022
* upstream/main:
  Don't insert superfluous newlines in subprocess log messages (mne-tools#11219)
  purge _get_args helper func (mne-tools#11215)
  Standardize topomap args (mne-tools#11123)
  MAINT: Ensure no datasets are downloaded in tests (mne-tools#11213)
larsoner added a commit to larsoner/mne-python that referenced this pull request Oct 11, 2022
* upstream/main: (64 commits)
  MAINT: Better check (mne-tools#11229)
  MAINT: Fix link and update instantiation note (mne-tools#11228)
  BUG: Add estimated fiducials when missing / assumed head coords (mne-tools#11212)
  Fix tfr db (mne-tools#11223)
  MAINT: Update link (mne-tools#11222)
  add CPGRL doc section (mne-tools#11216)
  Don't insert superfluous newlines in subprocess log messages (mne-tools#11219)
  purge _get_args helper func (mne-tools#11215)
  Standardize topomap args (mne-tools#11123)
  MAINT: Ensure no datasets are downloaded in tests (mne-tools#11213)
  MAINT: Fix Cirrus caching (mne-tools#11211)
  Fix mesh display in tutorial (mne-tools#11200)
  MAINT: Add arm64 CI using CirrusCI (mne-tools#11209)
  Fix spatial colors (mne-tools#11201)
  MAINT: Fix CircleCI error (mne-tools#11205) [circle deploy]
  Add regression-based approach to removing EOG artifacts (mne-tools#11046)
  [DOC, MRG] Minor documentation improvements and remove glossary entry for array-like (mne-tools#11207)
  Fix `include_tmax` not considered in `mne.io.Raw.crop` to check `tmax` in bounds (mne-tools#11204)
  MAINT: Fix notebook backend (mne-tools#11206)
  MRG: Fix displayed Raw duration in Jupyter notebook (mne-tools#11203)
  ...
@drammock drammock deleted the fixes-get-args branch October 26, 2022 14:11
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.

check if fixes._get_args can be replaced by builtin signature func

3 participants