mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-19 03:28:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add a hint for Requires-Python (#4021)

Browse source 
## Summary

As requested in the originating PR.
This commit is contained in:
Charlie Marsh 2024-06-04 16:52:15 -04:00 • committed by GitHub
parent 8eea470d49
commit 57ea55d218
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 54 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,19 +4,20 @@ use std::collections::{BTreeMap, BTreeSet};
use std::ops::Bound;
use derivative::Derivative;
use distribution_types::IndexLocations;
use indexmap::{IndexMap, IndexSet};
use owo_colors::OwoColorize;
use pep440_rs::Version;
use pubgrub::range::Range;
use pubgrub::report::{DerivationTree, Derived, External, ReportFormatter};
use pubgrub::term::Term;
use pubgrub::type_aliases::Map;
use rustc_hash::FxHashMap;
use distribution_types::IndexLocations;
use pep440_rs::{Version, VersionSpecifiers};
use uv_normalize::PackageName;
use crate::candidate_selector::CandidateSelector;
use crate::python_requirement::PythonRequirement;
use crate::python_requirement::{PythonRequirement, RequiresPython};
use crate::resolver::{IncompletePackage, UnavailablePackage, UnavailableReason};
use super::{PubGrubPackage, PubGrubPackageInner, PubGrubPython};
@ -534,8 +535,27 @@ impl PubGrubReportFormatter<'_> {
}
}
}
External::FromDependencyOf(package, package_set, dependency, dependency_set) => {
// Check for no versions due to `Requires-Python`.
if matches!(
&**dependency,
PubGrubPackageInner::Python(PubGrubPython::Target)
) {
if let Some(python) = self.python_requirement {
if let Some(RequiresPython::Specifiers(specifiers)) = python.target() {
hints.insert(PubGrubHint::RequiresPython {
requires_python: specifiers.clone(),
package: package.clone(),
package_set: self
.simplify_set(package_set, package)
.into_owned(),
package_requires_python: dependency_set.clone(),
});
}
}
}
}
External::NotRoot(..) => {}
External::FromDependencyOf(..) => {}
},
DerivationTree::Derived(derived) => {
hints.extend(self.hints(
@ -618,6 +638,16 @@ pub(crate) enum PubGrubHint {
#[derivative(PartialEq = "ignore", Hash = "ignore")]
reason: String,
},
/// The `Requires-Python` requirement was not satisfied.
RequiresPython {
requires_python: VersionSpecifiers,
#[derivative(PartialEq = "ignore", Hash = "ignore")]
package: PubGrubPackage,
#[derivative(PartialEq = "ignore", Hash = "ignore")]
package_set: Range<Version>,
#[derivative(PartialEq = "ignore", Hash = "ignore")]
package_requires_python: Range<Version>,
},
}
impl std::fmt::Display for PubGrubHint {
@ -709,7 +739,7 @@ impl std::fmt::Display for PubGrubHint {
textwrap::indent(reason, " ")
)
}
PubGrubHint::InconsistentVersionMetadata {
Self::InconsistentVersionMetadata {
package,
version,
reason,
@ -724,6 +754,23 @@ impl std::fmt::Display for PubGrubHint {
textwrap::indent(reason, " ")
)
}
Self::RequiresPython {
requires_python,
package,
package_set,
package_requires_python,
} => {
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 {}).",
"hint".bold().cyan(),
":".bold(),
requires_python.bold(),
PackageRange::compatibility(package, package_set).bold(),
package_requires_python.bold(),
package_requires_python.bold(),
)
}
}
}
}