Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAINT: Fix PySide6 and PyVista compat #11721

Merged
merged 8 commits into from
Jun 6, 2023
Merged

MAINT: Fix PySide6 and PyVista compat #11721

merged 8 commits into from
Jun 6, 2023

Conversation

larsoner
Copy link
Member

@larsoner larsoner commented Jun 5, 2023

Companion PR to pyvista/pyvista#4486, doesn't need to be reviewed or merged until that lands

Closes #11716

@larsoner larsoner changed the title WIP: Test PyVista API change MAINT: Fix PySide6 and PyVista compat Jun 5, 2023
@larsoner
Copy link
Member Author

larsoner commented Jun 5, 2023

The PyVista change is only a couple of lines and almost certainly going to be where they land, and this PR now fixes PySide6 testing so I'll mark for merge when green. Will open a follow-up PR for PyVista compat if needed but hopefully it won't be!

@larsoner larsoner marked this pull request as ready for review June 5, 2023 16:17
@larsoner larsoner enabled auto-merge (squash) June 5, 2023 16:17
@larsoner
Copy link
Member Author

larsoner commented Jun 5, 2023

Green on Azure with:

├☑ qtpy                 2.3.1 (PySide6=6.5.0)

Hooray!

@larsoner larsoner added the backport-candidate on-merge: backport to maint/1.7 label Jun 5, 2023
Copy link
Member

@hoechenberger hoechenberger left a comment

Choose a reason for hiding this comment

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

Wow, what an ugly hack :( but great work, @larsoner

@larsoner larsoner merged commit 13dd05a into mne-tools:main Jun 6, 2023
larsoner added a commit that referenced this pull request Jun 6, 2023
larsoner added a commit to larsoner/mne-python that referenced this pull request Jun 23, 2023
* upstream/main: (24 commits)
  Allow int-like as ID of make_fixed_length_events (mne-tools#11748)
  Easycap-M43 montage (mne-tools#11744)
  ENH: Create a Calibrations class for eyetracking data (mne-tools#11719)
  Fix alphabetical order in overview/people.rst, fix sphinx formatting in docstrings and set verbose to keyword-only (mne-tools#11745)
  Add Mathieu Scheltienne to MNE-Python Steering Council (mne-tools#11741)
  removed requirement for curv.*h files to create Brain object (mne-tools#11704)
  [BUG] Fix mne.viz.Brain.add_volume_labels matrix ordering bug (mne-tools#11730)
  Fix installer links (mne-tools#11729)
  MAINT: Update for PyVista deprecation (mne-tools#11727)
  MAINT: Update roadmap (mne-tools#11724)
  MAINT: Update download link [skip azp] [skip cirrus] [skip actions]
  fix case for chpi_info[1] == None (mne-tools#11714)
  Add cmap argument for mne.viz.utils.plot_sensors (mne-tools#11720)
  BUG: Fix one more PySide6 bug (mne-tools#11723)
  MAINT: Fix PySide6 and PyVista compat (mne-tools#11721)
  MRG: If _check_fname() cannot find a file, display the path in quotation marks to help spot accidental trailing spaces (mne-tools#11718)
  Add "array-like" to `_validate_type()` (mne-tools#11713)
  MAINT: Avoid problematic PySide6 (mne-tools#11715)
  Fix installer links (mne-tools#11709)
  Updating change log after PR mne-tools#11575 (mne-tools#11707)
  ...
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.7
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MAINT: Relax PySide6 restrictions
2 participants