Correct handling of test_sources on universal macOS builds. #2284
Conversation
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
joerick
approved these changes
Feb 24, 2025
Co-authored-by: Joe Rickerby <[email protected]>
henryiii
reviewed
Feb 24, 2025
test/test_macos_archs.py
Outdated
| "CIBW_ARCHS": "universal2" if build_universal2 else "x86_64 arm64", | ||
| "CIBW_BUILD_VERBOSITY": "3", | ||
| }, | ||
| add_env=dict( |
There was a problem hiding this comment.
Nit: I prefer {}, it's a bit faster (native syntax) and works in all cases (dict requires valid identifier keys), and ** still works.
There was a problem hiding this comment.
TIL - I didn't know ** syntax was legal inside {}. I've always fallen back to dict() when keyword expansion was needed. I'll push a cleanup.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Ensure that if a
test-sourcesconfiguration is provided, it's only copied on the first test pass.If a macOS project provides a
test-sourcesconfiguration, and that project is tested onuniversalarchitecture, there are 2 test passes. As currently configured, the second pass will fail beacuse thetest-sourcesfolder already exists.Adds an explicit test of
test-sourceson macOS, in both universal and non-universal configurations.Fixes #2283.