PR: Various additional fixes for Qt 6 compatibility #22620
Conversation
rear1019
force-pushed
the
qt6_fixes2
branch
2 times, most recently
from
12e4250 to
a4c3612
Compare
|
Hey @rear1019, thanks a lot for you continuing help to improve our Qt6 support! I'm going to leave this for 6.1 though (to be released in six months or so) because it includes a lot of changes that could introduce regressions to existing functionality. And perhaps you'll be pleased to know that I have a WIP branch that makes Spyder start with PySide 6 (I'll try to push it soon to include it in 6.1 as well). |
ccordoba12
changed the title
There was a problem hiding this comment.
Thanks @rear1019 for your work here and sorry for the late review! Left a couple of comments related with using the enum name to access some values but besides that the changes look good 👍
Also, thinking about the work here. it could be nice to have at some point the tests run over a job using PyQt6/PySide6 🤔
Anyhow, leaving this approved since technically QtPy should take care of accessing enum values without having to explicitly call via the enum.
Feel free to merge if you think this is ready @ccordoba12
The changes are backward compatible with Qt 5
There is no `called_once_with` method in `unittest.mock.Mocker`. Use the probably intended `assert_called_once_with()`. Remove the now redudant assert for `call_count`.
|
I have applied the review suggestions and rebased the branch against current |
@ccordoba12 Do you mind providing the patches? We intend to switch to Qt 6/PySide 6 this or next month, and are more than happy to help the project with the Qt 6 transition. |
Will try to do it next week (I was waiting for this PR to be merged to rebase mine on top).
That's great, thanks! Would you be willing to open a PR adding a new CI slot to run our test suite with PyQt6 or PySide6? You could add a single slot for Linux to start with. I think that's the best we could do to ensure that Spyder actually works with Qt6. |
Sorry for the slow response. I will look into that this or next week. |
Description of Changes
Various fixes for Qt 6 compatibility. The changes are backward compatible with Qt 5.
Affirmation
By submitting this Pull Request or typing my (user)name below,
I affirm the Developer Certificate of Origin
with respect to all commits and content included in this PR,
and understand I am releasing the same under Spyder's MIT (Expat) license.
I certify the above statement is true and correct:
rear1019