Update macOS support to run on arm64 #2334
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
|
Hi @tomkins,
Thanks, it LGTM so I'll approve it once CI runs. None of the primary developers use macOS anymore, so support has been slowly bitrotting. That said, we're happy to receive patches to make macOS work as long as they don't really interfere with Linux usage. And, let us know if there's anything we can do to make contributing to SecureDrop easier for you! |
legoktm
previously approved these changes
Dec 20, 2024
As arm64 PyQt5 wheels are only available for slightly later versions - install the latest possible version for macOS (darwin), but leave Linux packages at the specific pinned version
legoktm
approved these changes
Dec 20, 2024
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.
Status
Ready for review
Description
Fixes #2333.
Updates pyproject.toml to install a later version of PyQt5 - but only for macOS. Slightly later versions provide arm64 wheels, which makes installing the development environment a lot easier.
As arm64 PyQt5 wheels are only available for slightly later versions - install the latest possible version for macOS (darwin), but leave Linux packages at the specific pinned version (so it keeps it in sync with Debian bookworm).
Happy to tweak this if needed, and I understand this isn't your primary target environment if the change isn't wanted.
Test Plan
Checklist