Add a universal resolution mode to pip compile
#4505
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
charliermarsh
changed the title
pip compile
charliermarsh
commented
Jun 25, 2024
charliermarsh
force-pushed
the
charlie/universal
branch
from
48f0840
to
7a1c526
Compare
charliermarsh
force-pushed
the
charlie/req-txt
branch
from
a651af0
to
82c6ea1
Compare
charliermarsh
force-pushed
the
charlie/universal
branch
from
7a1c526
to
b2d4852
Compare
konstin
approved these changes
Jun 25, 2024
| /// Perform a universal resolution, attempting to generate a single `requirements.txt` output | ||
| /// file that is compatible with all Python platforms. | ||
| #[arg(long, overrides_with("no_universal"))] | ||
| pub universal: bool, |
crates/uv-cli/src/lib.rs
Outdated
| @@ -568,6 +568,14 @@ pub struct PipCompileArgs { | |||
| #[arg(long)] | |||
| pub python_platform: Option<TargetTriple>, | |||
|
|
|||
| /// Perform a universal resolution, attempting to generate a single `requirements.txt` output | |||
| /// file that is compatible with all Python platforms. | |||
There was a problem hiding this comment.
"Python platforms" is likely unclear to the users, we likely need something along the lines of "all operating systems, architectures and supported Python versions, as supported by your dependencies"
charliermarsh
force-pushed
the
charlie/universal
branch
3 times, most recently
from
9fd6651
to
2c3173d
Compare
charliermarsh
commented
Jun 25, 2024
| }; | ||
| let expr_python_full_version = MarkerExpression::Version { | ||
| key: MarkerValueVersion::PythonFullVersion, | ||
| specifier: VersionSpecifier::from_version(Operator::Equal, version).unwrap(), |
There was a problem hiding this comment.
I'm a bit unsure of this. It still locks against the target Python version rather than "the target version at minimum." It's easy to change but not sure what the right semantics are.
There was a problem hiding this comment.
My feeling is:
requires-pythonif the input is apyproject.toml(the conjunction of allrequires-pythonvalues if there are multiplepyproject.toml).- An explicit
--requires-pythonargument. >={{current python}}and inform the user that the should consider passing--requires-pythonif they want an interpreter independent resolution.
BurntSushi
approved these changes
Jun 25, 2024
| .requires_python() | ||
| .map(RequiresPython::to_marker_tree) | ||
| .unwrap_or_else(|| MarkerTree::And(vec![])), | ||
| ) |
There was a problem hiding this comment.
Nice. You got rid of the MarkerTree::And(vec![])! I think the change is for the better right? My understanding is that now it will always have some non-empty marker expression in universal mode. So that when Requires-Python isn't provided, it will be based on the installed version of Python? Where as previously, there would be no filtering at all.
charliermarsh
force-pushed
the
charlie/req-txt
branch
3 times, most recently
from
63c943b
to
d41022e
Compare
charliermarsh
force-pushed
the
charlie/universal
branch
from
2c3173d
to
359f76c
Compare
charliermarsh
force-pushed
the
charlie/universal
branch
2 times, most recently
from
7e3b618
to
a09c19e
Compare
charliermarsh
force-pushed
the
charlie/universal
branch
from
a09c19e
to
2c74b08
Compare
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.
Summary
This needs more tests and a few more changes, but checkpointing it for now.