Merged
Conversation
Closed
Use QIODevice instead of QIODeviceBase
radarhere
approved these changes
Oct 18, 2021
Member
radarhere
left a comment
There was a problem hiding this comment.
It's not clear why I chose OpenMode in #5258. Perhaps I just misunderstood https://doc.qt.io/qt-5/qiodevice.html#OpenModeFlag-enum ?
Happy for it to be left in or removed.
Member
Author
|
Something has actually changed since PyQt6 6.0.0 and 6.2.0, and the old code is still needed. On Mac, this fails on And this passes for both |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #5774.
There are two problems in #5774:
First (Qt test failures #5774 (comment)) is a possibly intermittent failure on the CI on release day
seems to have resolved itselfand still sometimes happening. It's possibly an issue with the MSYS2/MinGW build of Qt.Second (Qt test failures #5774 (comment)) is a failure with PyQt 6.2.0 on Windows
This PR fixes the second,
We've only been testing PyQt5 on the CI. I can also reproduce this locally using PyQt6 on macOS, and on CI with MinGW (https://github.com/hugovk/Pillow/runs/3915553306?check_suite_focus=true), so platform is irrelevant.
We added PyQt6 support in #5258, but as far as I can tell that should never have worked:
I compared the sdist of PyQt 6.0.0 with 6.0.3 (latest 6.0.x), and 6.1.1 (latest 6.1.x) and 6.2.0 (latest 6.2.x) and didn't see anything much changing in
qiodevice*files.So I don't know if we really need
QIODevice.OpenModefrom #5258. If no-one else is sure, guess it's okay to keep it in thetry/except.This also tests PyQt6 on the CI, on MinGW, to hopefully fix the first part, and means we're now testing both PyQt5 and 6 on CI.