Add generated ui.py files for qt6 #173
Merged
Conversation
This file contains 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
We don't want to fully update Pipfile.lock, since I've had issues with making pure-python (C-free) builds (for dist/) of the later versions of some of our dependencies (PyYAML, I think).
This is to make it easier for git to follow the file history upon rename.
Fix Stvad#170. We're slavishly copying the convention used by anki in `qt/aqt/forms/` (up to the presence of the type: ignore comment). The old qt5 files are moved from *_ui.py to *_ui_qt5.py. The new qt6 files are *_ui_qt6.py. generate_ui.sh was run from within the pipenv (pipenv shell). I'm not yet sure whether to change the script to have `pipenv run ...` at the start of all the lines, or to update CONTRIBUTING.md.
This means that we can run the script directly (rather than as `pipenv run ./generate_ui.sh`). This is for convenience and consistency with `fetch_dependencies.sh`. CONTRIBUTING.md has been appropriately updated.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix #170.
We're slavishly copying the convention used by anki in
qt/aqt/forms/(up to the presence of the type: ignore comment).The old qt5 files are moved from *_ui.py to *_ui_qt5.py.
The new qt6 files are *_ui_qt6.py.
generate_ui.sh was run from within the pipenv (
pipenv shell).I've changed the script to have
pipenv run ...at the start of all the lines, and updated CONTRIBUTING.md.In order to have easy access to pyuic6, I added PyQt6 to our dev dependencies (while minimally changing Pipfile.lock — we don't want to fully update Pipfile.lock, since I've had issues with making pure-python (C-free) builds (for dist/) of the later versions of some of our dependencies (PyYAML, I think)).
AFAICT mostly pyuic6 isn't packaged in stable Linux distros, so running it from our pipenv is probably the cleanest solution, and we may as well switch to running pyuic5 from there, for consistency.
Ugh. I'm being bitten by #145. (
aqt.qtis being mocked, so qtmajor is also a mock, so can't be compared... I'll probably solve this by going deeper in on the "hack-ish" test solution. :D )