mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 19:08:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use requires-python semantics for --universal (#4701)

Browse source 
## Summary

This doesn't actually change any behaviors, but it does make it a bit
easier to solve #4669, because we don't have to support "version
narrowing" for the non-`RequiresPython` variants in here. Right now, the
semantics are kind of muddied, because the `target` variant is
_sometimes_ interpreted as an exact version and sometimes as a lower
bound.
This commit is contained in:
Charlie Marsh 2024-07-01 15:16:40 -04:00 • committed by GitHub
parent 348efa26ba
commit f3d1e52e65
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 27 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/uv-resolver/src/pubgrub/report.rs
View file

@ -831,7 +831,7 @@ impl std::fmt::Display for PubGrubHint {
} => {
write!(
f,
"{}{} The `Requires-Python` requirement ({}) defined in your `pyproject.toml` includes Python versions that are not supported by your dependencies (e.g., {} only supports {}). Consider using a more restrictive `Requires-Python` requirement (like {}).",
"{}{} The `Requires-Python` requirement ({}) includes Python versions that are not supported by your dependencies (e.g., {} only supports {}). Consider using a more restrictive `Requires-Python` requirement (like {}).",
"hint".bold().cyan(),
":".bold(),
requires_python.bold(),

36
crates/uv-resolver/src/python_requirement.rs
View file

@ -1,5 +1,5 @@
use pep440_rs::{Operator, Version, VersionSpecifier, VersionSpecifiers};
use pep508_rs::{MarkerExpression, MarkerTree, MarkerValueVersion, StringVersion};
use pep440_rs::VersionSpecifiers;
use pep508_rs::{MarkerTree, StringVersion};
use uv_toolchain::{Interpreter, PythonVersion};
use crate::RequiresPython;
@ -62,32 +62,12 @@ impl PythonRequirement {
/// Return a [`MarkerTree`] representing the Python requirement.
///
/// See: [`RequiresPython::to_marker_tree`]
pub fn to_marker_tree(&self) -> MarkerTree {
let version = match &self.target {
None => self.installed.version.clone(),
Some(PythonTarget::Version(version)) => version.version.clone(),
Some(PythonTarget::RequiresPython(requires_python)) => {
return requires_python.to_marker_tree()
}
};
let version_major_minor_only = Version::new(version.release().iter().take(2));
let expr_python_version = MarkerExpression::Version {
key: MarkerValueVersion::PythonVersion,
specifier: VersionSpecifier::from_version(
Operator::GreaterThanEqual,
version_major_minor_only,
)
.unwrap(),
};
let expr_python_full_version = MarkerExpression::Version {
key: MarkerValueVersion::PythonFullVersion,
specifier: VersionSpecifier::from_version(Operator::GreaterThanEqual, version).unwrap(),
};
MarkerTree::And(vec![
MarkerTree::Expression(expr_python_version),
MarkerTree::Expression(expr_python_full_version),
])
pub fn to_marker_tree(&self) -> Option<MarkerTree> {
if let Some(PythonTarget::RequiresPython(requires_python)) = self.target.as_ref() {
Some(requires_python.to_marker_tree())
} else {
None
}
}
}

11
crates/uv-resolver/src/resolver/mod.rs
View file

@ -191,11 +191,6 @@ impl<Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvider>
provider: Provider,
installed_packages: InstalledPackages,
) -> Result<Self, ResolveError> {
let requires_python = if markers.is_some() {
None
} else {
Some(python_requirement.to_marker_tree())
};
let state = ResolverState {
index: index.clone(),
git: git.clone(),
@ -214,8 +209,12 @@ impl<Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvider>
exclusions: manifest.exclusions,
hasher: hasher.clone(),
markers: markers.cloned(),
requires_python: if markers.is_some() {
None
} else {
python_requirement.to_marker_tree()
},
python_requirement: python_requirement.clone(),
requires_python,
reporter: None,
installed_packages,
};