Implement variant-specific patches #488
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
Fromager now supports variant-specific patches in additional to versioned and unversioned patches. Variant-specific patches are in subfolders, e.g. `atches/test_pkg-1.0.2/cpu/005-cpuver.patch`. Patch files are sorted alphanumerically by their *base* name, not their full path. This allows users to sort versioned/unversioned and plain/variant patches as they like. Internal changes: `sources.patch_source()` now uses `PackageBuildInfo` to get patches. `patches_for_requirement()` has been removed. Fixes: python-wheel-build#486 Signed-off-by: Christian Heimes <[email protected]>
rd4398
approved these changes
Oct 28, 2024
There was a problem hiding this comment.
LGTM!
I will leave it to @dhellmann for final approval and merging
dhellmann
reviewed
Nov 1, 2024
| pattern = f"{self.override_module_name}-*" | ||
| prefix_len = len(pattern) - 1 | ||
| version: Version | None | ||
| pattern = f"{self.override_module_name}*" |
There was a problem hiding this comment.
This pattern is going to find patches for foo-bar when it the module is foo.
There was a problem hiding this comment.
Patch directories use module override names, so foo-bar is normalized to foo_bar.
There was a problem hiding this comment.
I added a test and fix in #493
dhellmann
added a commit
to dhellmann/fromager
that referenced
this pull request
Nov 3, 2024
Fix a problem introduced in python-wheel-build#488 that could cause packages with a prefix common to another package's full name to have their patches included when scanning for patches of the package with the shorter name. For example, with patches for both 'foo' and 'foo-bar' when patches for 'foo' are loaded they would have included patches for 'foo-bar'.
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.
Fromager now supports variant-specific patches in additional to versioned and unversioned patches. Variant-specific patches are in subfolders, e.g.
atches/test_pkg-1.0.2/cpu/005-cpuver.patch.Patch files are sorted alphanumerically by their base name, not their full path. This allows users to sort versioned/unversioned and plain/variant patches as they like.
Internal changes:
sources.patch_source()now usesPackageBuildInfoto get patches.patches_for_requirement()has been removed.Fixes: #486