Skip to content

Conversation

@larsoner
Copy link
Member

@larsoner larsoner commented Feb 15, 2023

Let's see if it works

Closes #11476

@larsoner larsoner enabled auto-merge (squash) February 15, 2023 14:33
@drammock
Copy link
Member

macos failure is unrelated:

______________ ERROR at teardown of test_foci_mapping[pyvistaqt] _______________
mne/conftest.py:982: in qt_windows_closed
    assert n_before == n_after, widgets[-4:]
E   AssertionError: [<PyQt5.QtWidgets.QMenu object at 0x7fd44b87d3a0>, <PyQt5.QtWidgets.QWidget object at 0x7fd3ffd52820>, <PyQt5.QtWidgets.QFrame object at 0x7fd3ffd520d0>, <PyQt5.QtWidgets.QMessageBox object at 0x7fd44b858670>]
E   assert 18 == 23

@larsoner larsoner merged commit 62c5e42 into mne-tools:main Feb 15, 2023
@larsoner larsoner deleted the ci branch February 15, 2023 20:51
larsoner added a commit to drammock/mne-python that referenced this pull request Feb 22, 2023
* upstream/main: (46 commits)
  Fix docstrings by replacing str with path-like and fix double backticks for formatting (mne-tools#11499)
  Use pathlib.Path instead of os.path to handle files and folders [circle deploy] (mne-tools#11473)
  MAINT: Fix Circle [circle deploy] (mne-tools#11497)
  MAINT: Use mamba in CIs (mne-tools#11471)
  Updating documentation to clarify full vs half-bandwidth and defaults in time_frequency.multitaper.py (mne-tools#11479)
  Fix typo in tutorial (mne-tools#11498)
  Typo fix and added colons before code (mne-tools#11496)
  [MRG] ENH/DOC: demo custom spectrum creation (mne-tools#11493)
  Accept only left-clicks for adding annotations (mne-tools#11491)
  [BUG, MRG] Fix pial surface loading, logging in locate_ieeg (mne-tools#11489)
  [ENH] Added unit_role to add non-breaking space between magnitude  and units (mne-tools#11469)
  MAINT: Fix CircleCI build (mne-tools#11488)
  [DOC] Updated decoding.SSD documentation and internal variable naming (mne-tools#11475)
  Typo fix (mne-tools#11485)
  [MRG] Forward argument axes from plot_sensors to DigMontage.plot (mne-tools#11470)
  [MRG] Improve error message raised on channels missing from DigMontage (mne-tools#11472)
  MAINT: Deal with pkg_resources usage bugs (mne-tools#11478)
  Add object array support and docstring (mne-tools#11465)
  [ENH] Adjusted SSD algorithm to support non-full rank data (mne-tools#11458)
  [BUG] fix nibabel reference (mne-tools#11467)
  ...
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.

many CI failures related to pkg_resources

2 participants