Skip to content

Improve display of ranges when pre-releases are not allowed #9944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zanieb merged 2 commits into from
Dec 17, 2024
Merged

Improve display of ranges when pre-releases are not allowed #9944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
311cad1
Improve display of ranges when pre-releases are not allowed
zanieb Dec 17, 2024
5cbb9ac
Update crates/uv-resolver/src/error.rs
zanieb Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 115 additions & 18 deletions crates/uv-resolver/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use uv_static::EnvVars;
use crate::candidate_selector::CandidateSelector;
use crate::dependency_provider::UvDependencyProvider;
use crate::fork_urls::ForkUrls;
use crate::prerelease::AllowPrerelease;
use crate::pubgrub::{PubGrubPackage, PubGrubPackageInner, PubGrubReportFormatter};
use crate::python_requirement::PythonRequirement;
use crate::resolution::ConflictingDistributionError;
Expand Down Expand Up @@ -333,10 +334,17 @@ impl std::fmt::Display for NoSolutionError {
}

collapse_unavailable_versions(&mut tree);
collapse_redundant_no_versions(&mut tree);
collapse_redundant_depends_on_no_versions(&mut tree);

simplify_derivation_tree_ranges(&mut tree, &self.available_versions);
simplify_derivation_tree_ranges(
&mut tree,
&self.available_versions,
&self.selector,
&self.env,
);

// This needs to be applied _after_ simplification of the ranges
collapse_redundant_no_versions(&mut tree);

while collapse_redundant_no_versions_tree(&mut tree) {
// Continue collapsing until no more redundant nodes are found
Expand Down Expand Up @@ -456,15 +464,17 @@ fn collapse_redundant_no_versions(
// First, always recursively visit the other side of the tree
collapse_redundant_no_versions(other);

let DerivationTree::Derived(derived) = other else {
return;
// Retrieve the nearest terms, either alongside this node or from the parent.
let package_terms = if let DerivationTree::Derived(derived) = other {
derived.terms.get(package)
} else {
derived.terms.get(package)
};

// If the range in the conclusion (terms) matches the range of no versions,
// then we'll drop this node
let Some(Term::Positive(term)) = derived.terms.get(package) else {
let Some(Term::Positive(term)) = package_terms else {
return;
};

let versions = versions.complement();

// If we're disqualifying a single version, this is important to retain, e.g,
Expand All @@ -473,11 +483,13 @@ fn collapse_redundant_no_versions(
return;
}

if *term != versions {
// If the range in the conclusion (terms) matches the range of no versions,
// then we'll drop this node. If the range is "all versions", then there's no
// also no need to enumerate the available versions.
if *term != Range::full() && *term != versions {
Copy link
Member Author

@zanieb zanieb Dec 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change extends #9885 to apply to https://github.com/astral-sh/uv/pull/9944/files#diff-4decbdad65ae6c2e77b162950bc1a15907dacaff952fcee61559704bf370fb06R2172 which would now otherwise enumerate all the anyio versions

return;
}

// Replace this node with the other tree
*tree = other.clone();
}
// If not, just recurse
Expand Down Expand Up @@ -1088,44 +1100,94 @@ impl std::fmt::Display for NoSolutionHeader {
fn simplify_derivation_tree_ranges(
tree: &mut DerivationTree<PubGrubPackage, Range<Version>, UnavailableReason>,
available_versions: &FxHashMap<PackageName, BTreeSet<Version>>,
candidate_selector: &CandidateSelector,
resolver_environment: &ResolverEnvironment,
) {
match tree {
DerivationTree::External(external) => match external {
External::FromDependencyOf(package1, versions1, package2, versions2) => {
if let Some(simplified) = simplify_range(versions1, package1, available_versions) {
if let Some(simplified) = simplify_range(
versions1,
package1,
available_versions,
candidate_selector,
resolver_environment,
) {
*versions1 = simplified;
}
if let Some(simplified) = simplify_range(versions2, package2, available_versions) {
if let Some(simplified) = simplify_range(
versions2,
package2,
available_versions,
candidate_selector,
resolver_environment,
) {
*versions2 = simplified;
}
}
External::NoVersions(package, versions) => {
if let Some(simplified) = simplify_range(versions, package, available_versions) {
if let Some(simplified) = simplify_range(
versions,
package,
available_versions,
candidate_selector,
resolver_environment,
) {
*versions = simplified;
}
}
External::Custom(package, versions, _) => {
if let Some(simplified) = simplify_range(versions, package, available_versions) {
if let Some(simplified) = simplify_range(
versions,
package,
available_versions,
candidate_selector,
resolver_environment,
) {
*versions = simplified;
}
}
External::NotRoot(..) => (),
},
DerivationTree::Derived(derived) => {
// Recursively simplify both sides of the tree
simplify_derivation_tree_ranges(Arc::make_mut(&mut derived.cause1), available_versions);
simplify_derivation_tree_ranges(Arc::make_mut(&mut derived.cause2), available_versions);
simplify_derivation_tree_ranges(
Arc::make_mut(&mut derived.cause1),
available_versions,
candidate_selector,
resolver_environment,
);
simplify_derivation_tree_ranges(
Arc::make_mut(&mut derived.cause2),
available_versions,
candidate_selector,
resolver_environment,
);

// Simplify the terms
derived.terms = std::mem::take(&mut derived.terms)
.into_iter()
.map(|(pkg, term)| {
let term = match term {
Term::Positive(versions) => Term::Positive(
simplify_range(&versions, &pkg, available_versions).unwrap_or(versions),
simplify_range(
&versions,
&pkg,
available_versions,
candidate_selector,
resolver_environment,
)
.unwrap_or(versions),
),
Term::Negative(versions) => Term::Negative(
simplify_range(&versions, &pkg, available_versions).unwrap_or(versions),
simplify_range(
&versions,
&pkg,
available_versions,
candidate_selector,
resolver_environment,
)
.unwrap_or(versions),
),
};
(pkg, term)
Expand All @@ -1142,6 +1204,8 @@ fn simplify_range(
range: &Range<Version>,
package: &PubGrubPackage,
available_versions: &FxHashMap<PackageName, BTreeSet<Version>>,
candidate_selector: &CandidateSelector,
resolver_environment: &ResolverEnvironment,
) -> Option<Range<Version>> {
// If there's not a package name or available versions, we can't simplify anything
let name = package.name()?;
Expand All @@ -1159,6 +1223,39 @@ fn simplify_range(
}
}

// Check if pre-releases are allowed
let prereleases_not_allowed = candidate_selector
.prerelease_strategy()
.allows(name, resolver_environment)
!= AllowPrerelease::Yes;

let any_prerelease = range.iter().any(|(start, end)| {
let is_pre1 = match start {
Bound::Included(version) => version.any_prerelease(),
Bound::Excluded(version) => version.any_prerelease(),
Bound::Unbounded => false,
};
let is_pre2 = match end {
Bound::Included(version) => version.any_prerelease(),
Bound::Excluded(version) => version.any_prerelease(),
Bound::Unbounded => false,
};
is_pre1 || is_pre2
});
Comment on lines +1232 to +1244
Copy link
Member Author

@zanieb zanieb Dec 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed for #9944 (comment)


// Simplify the range, as implemented in PubGrub
Some(range.simplify(versions.iter()))
Some(range.simplify(versions.iter().filter(|version| {
// If there are pre-releases in the range segments, we need to include pre-releases
if any_prerelease {
return true;
}

// If pre-releases are not allowed, filter out pre-releases
if prereleases_not_allowed && version.any_prerelease() {
return false;
}

// Otherwise, include the version
true
})))
}
12 changes: 1 addition & 11 deletions crates/uv/tests/it/cache_prune.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,17 +257,7 @@ fn prune_unzipped() -> Result<()> {

----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because only the following versions of iniconfig are available:
iniconfig<=0.1
iniconfig>=1.0.0
and all of:
iniconfig<=0.1
iniconfig>=1.0.0
need to be downloaded from a registry, we can conclude that all of:
iniconfig<=0.1
iniconfig>=1.0.0
cannot be used.
And because you require iniconfig, we can conclude that your requirements are unsatisfiable.
╰─▶ Because all versions of iniconfig need to be downloaded from a registry and you require iniconfig, we can conclude that your requirements are unsatisfiable.

hint: Pre-releases are available for `iniconfig` in the requested range (e.g., 0.2.dev0), but pre-releases weren't enabled (try: `--prerelease=allow`)

Expand Down
21 changes: 1 addition & 20 deletions crates/uv/tests/it/pip_install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2172,26 +2172,7 @@ fn install_only_binary_all_and_no_binary_all() {

----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because only the following versions of anyio are available:
anyio>=1.0.0,<=1.4.0
anyio>=2.0.0,<=2.2.0
anyio>=3.0.0,<=3.6.2
anyio>=3.7.0,<=3.7.1
anyio>=4.0.0
and all of:
anyio>=1.0.0,<=1.4.0
anyio>=2.0.0,<=2.2.0
anyio>=3.0.0,<=3.6.2
anyio>=3.7.0,<=3.7.1
anyio>=4.0.0
have no usable wheels, we can conclude that all of:
anyio>=1.0.0,<=1.4.0
anyio>=2.0.0,<=2.2.0
anyio>=3.0.0,<=3.6.2
anyio>=3.7.0,<=3.7.1
anyio>=4.0.0
cannot be used.
And because you require anyio, we can conclude that your requirements are unsatisfiable.
╰─▶ Because all versions of anyio have no usable wheels and you require anyio, we can conclude that your requirements are unsatisfiable.

hint: Pre-releases are available for `anyio` in the requested range (e.g., 4.0.0rc1), but pre-releases weren't enabled (try: `--prerelease=allow`)

Expand Down