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.

Sign up for GitHub

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

Jump to bottom

Test and restore compatibility with older PySide/PyQt versions #597

Merged
merged 6 commits into from
Mar 25, 2025
Merged

Test and restore compatibility with older PySide/PyQt versions #597

merged 6 commits into from
Mar 25, 2025

Conversation

The-Compiler
Copy link
Member

@The-Compiler The-Compiler commented Mar 25, 2025 •
edited
Loading

This PR:

  • Reverts Enable qInfo tests for PySide6 #593, and thus restores compatibility with PySide6 < 6.8.2, as we want to support older versions as well
  • Instead makes sure that the tests run in both scenarios properly (whether qInfo is present or not)
  • Makes sure we use the real qInfo (and not our QMessageLogger shim) if present
  • Fixes exception capture tests with more fine-grained Qt backend version checks so that they also run with older PySide versions
  • Actually runs the tests on CI for PyQt6 6.1 and PySide6 6.0 (both of which we claim to support according to the checks in qt_compat.py) to avoid future regressions
  • Fixes an issue in the testsuite which leaked global patching and broke those checks

Probably best reviewed commit by commit (and not squash-merged).

@The-Compiler
Revert "Enable qInfo tests for PySide6 (#593)"
a26733c 
This reverts commit ce1a689.

This change is incorrect as it breaks things with PySide < 6.8.2, but we support
running against older versions.

The next commit will fix this properly without breaking compatibility.

See #232
@The-Compiler
tests: Make qInfo tests work with PySide6 6.8.2+
40d237a 
qInfo() has been added:
https://codereview.qt-project.org/c/pyside/pyside-setup/+/605100

Follow-up / alternative to #593 without breaking compatibility with older
PySide6 versions. See #232.
@The-Compiler
tests: Fix exception capture tests with older PySide6
917872f 
Follow-up to #525 to conditionally do the right thing based on the PySide6
version, so we can continue to run tests with older versions.
@The-Compiler
ci: Run tests with oldest supported PySide/PyQt versions
e648ad6 
We support older versions of PySide6/PyQt6, so we should also test with the
oldest versions we support to prevent regressions.
@The-Compiler
tests: Fix test_header patching leaking into other tests
fa95d0d 
Since we run pytester in-process, the patching of qt_api.get_versions will leak
into the rest of the testsuite (even if done in a temporary conftest.py, the
qt_api module is the same!). This causes Qt API version checks in the testsuite
to be broken.
@The-Compiler The-Compiler mentioned this pull request Mar 25, 2025
Merged
nicoddemus
nicoddemus approved these changes Mar 25, 2025
View reviewed changes
Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

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

Thanks, appreciate the individual commits.

I fumbled on #593, thanks for fixing it!

@The-Compiler The-Compiler merged commit 05365df into master Mar 25, 2025
50 checks passed
@The-Compiler The-Compiler deleted the restore-qinfo-compat branch March 25, 2025 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nicoddemus nicoddemus nicoddemus approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@The-Compiler @nicoddemus