feat: Support multiple constraints files #540
Draft
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 multiple constraints files. The option `fromager --constraints-file` can be supplied multiple times. The option no longer accepts URLs. Remote constraints files are now specified with `--constraints-url`. The split was necessary to correctly parse environment variables with multiple entries and white spaces in local file names. Paths are split at `:`, URLs are split at ` ` (white space). There can only be one constraint per package. Internally, remote constraints from `https://` URLs are no longer retrieved twice. Instead all constraints are merged and the final set is dumped into a single constraints file. Fixes: python-wheel-build#539 Signed-off-by: Christian Heimes <[email protected]>
tiran
force-pushed
the
multi-constraints
branch
from
481ab95 to
c295a82
Compare
dhellmann
approved these changes
Jan 24, 2025
| logger.info(f"network isolation: {network_isolation}") | ||
| overrides.log_overrides() | ||
|
|
||
| if network_isolation and not SUPPORTS_NETWORK_ISOLATION: | ||
| ctx.fail(f"network isolation is not available: {NETWORK_ISOLATION_ERROR}") | ||
|
|
||
| constraints: list[str] = list(constraints_url) | ||
| constraints.extend(os.fspath(p) for p in constraints_file) |
There was a problem hiding this comment.
This implies that constraints at URLs take precedence over local files. I don't think that ordering is wrong, but I can definitely imagine wanting a local file to have a value that replaces a value in some global file on a web server.
| """Dump all constraints into a file""" | ||
| with constraints_file.open("w", encoding="utf-8") as f: | ||
| for req in self._data.values(): | ||
| f.write(f"{req}\n") |
There was a problem hiding this comment.
Do we log the constraints as we parse the input? I know we log matching constraints as we process individual packages. It may also be useful to log the contents of this file to help with debugging.
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 multiple constraints files. The option
fromager --constraints-filecan be supplied multiple times. The option no longer accepts URLs. Remote constraints files are now specified with--constraints-url. The split was necessary to correctly parse environment variables with multiple entries and white spaces in local file names. Paths are split at:, URLs are split atThere can only be one constraint per package.
Internally, remote constraints from
https://URLs are no longer retrieved twice. Instead all constraints are merged and the final set is dumped into a single constraints file.Fixes: #539