Convert --target to --filter-platform and pass it to cargo-metadata #2562
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
An explicitly-specified target may simplify the dependency graph, i.e. crates unused on the target may be omitted. Cargo-fetch does this type of simplification and may pull fewer packages with --target argument. maturin build doesn't pass the specified triple to cargo-metadata currently as --target isn't supported in cargo-metadata. When building reproducibly with cargo-fetch and --frozen argument, this could ultimately lead to a confusing and annoying dependency that cannot be resolved offline, since cargo-metadata has no idea about the target and cannot just drop the unnecessary dependency. However, cargo-metadata does support --filter-platform since Cargo 1.40, which plays basically the same role as --target during dependency resolving. Let's translate --target to --filter-platform when calling cargo-metadata to handle the case. Closes: PyO3#2561 Signed-off-by: Yao Zi <ziyao@disroot.org>
270b2cc to
042e292
Compare
|
The failed test seems to be caused by some random network issues |
konstin
added a commit
that referenced
this pull request
May 9, 2025
#2562 introduced a regression breaking publishing maturin (https://github.com/PyO3/maturin/actions/runs/14923136319/job/41923286669). This PR moves the target triple type from a String to an enum, forcing all consumers to handle the virtual universal2 target themselves. I tested this as far as possible on Linux, but it's missing real macOS testing (there are two different error messages for universal2 build before and after the regression and it's now back to the "good" error message).
messense
pushed a commit
that referenced
this pull request
May 9, 2025
#2562 introduced a regression breaking publishing maturin (https://github.com/PyO3/maturin/actions/runs/14923136319/job/41923286669). This PR moves the target triple type from a String to an enum, forcing all consumers to handle the virtual universal2 target themselves. I tested this as far as possible on Linux, but it's missing real macOS testing (there are two different error messages for universal2 build before and after the regression and it's now back to the "good" error message).
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.
An explicitly-specified target may simplify the dependency graph, i.e. crates unused on the target may be omitted. Cargo-fetch does this type of simplification and may pull fewer packages with --target argument.
maturin build doesn't pass the specified triple to cargo-metadata currently as --target isn't supported in cargo-metadata. When building reproducibly with cargo-fetch and --frozen argument, this could ultimately lead to a confusing and annoying dependency that cannot be resolved offline, since cargo-metadata has no idea about the target and cannot just drop the unnecessary dependency.
However, cargo-metadata does support --filter-platform since Cargo 1.40, which plays basically the same role as --target during dependency resolving. Let's translate --target to --filter-platform when calling cargo-metadata to handle the case.
Closes: #2561
This is the first time that I play with Rust, thanks for your patience and guide.