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

Move adding dependencies for versions into dedicated method (#4410)

Browse source 
To support diverging urls, we have to check urls when adding
dependencies (after forking). To prepare for this, i've moved adding
dependencies for the current version to
`SolveState::add_package_version_dependencies` and removed the
duplication when checking for self-dependencies.

This changed is joined with a change in pubgrub
(https://github.com/astral-sh/pubgrub/pull/27) that simplifies the same
code path.
This commit is contained in:
konsti 2024-06-19 20:19:12 +02:00 • committed by GitHub
parent a68146d978
commit 3c5b13695e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 43 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -2693,7 +2693,7 @@ dependencies = [
[[package]]
name = "pubgrub"
version = "0.2.1"
source = "git+https://github.com/astral-sh/pubgrub?rev=a68cbd1a26e43986a31563e1d127e83bafca3a0c#a68cbd1a26e43986a31563e1d127e83bafca3a0c"
source = "git+https://github.com/astral-sh/pubgrub?rev=b4435e2f3af10dab2336a0345b35dcd622699d06#b4435e2f3af10dab2336a0345b35dcd622699d06"
dependencies = [
"indexmap",
"log",

2
Cargo.toml
View file

@ -101,7 +101,7 @@ path-slash = { version = "0.2.1" }
pathdiff = { version = "0.2.1" }
petgraph = { version = "0.6.4" }
platform-info = { version = "2.0.2" }
pubgrub = { git = "https://github.com/astral-sh/pubgrub", rev = "a68cbd1a26e43986a31563e1d127e83bafca3a0c" }
pubgrub = { git = "https://github.com/astral-sh/pubgrub", rev = "b4435e2f3af10dab2336a0345b35dcd622699d06" }
pyo3 = { version = "0.21.0" }
pyo3-log = { version = "0.10.0" }
quote = { version = "1.0.36" }

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

@ -495,9 +495,8 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
.insert(version.clone())
{
// Retrieve that package dependencies.
let package = state.next.clone();
let forked_deps = self.get_dependencies_forking(
&package,
&state.next,
&version,
&state.markers,
&mut state.priorities,
@ -508,40 +507,18 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
state
.pubgrub
.add_incompatibility(Incompatibility::custom_version(
package.clone(),
state.next.clone(),
version.clone(),
UnavailableReason::Version(reason),
));
forked_states.push(state);
}
ForkedDependencies::Unforked(constraints) => {
if constraints
.iter()
.any(|(dependency, _)| dependency == &package)
{
if enabled!(Level::DEBUG) {
prefetcher.log_tried_versions();
}
return Err(PubGrubError::SelfDependency {
package: package.clone(),
version: version.clone(),
}
.into());
}
// Add that package and version if the dependencies are not problematic.
let dep_incompats =
state.pubgrub.add_incompatibility_from_dependencies(
package.clone(),
version.clone(),
constraints,
);
state.pubgrub.partial_solution.add_version(
package.clone(),
version.clone(),
dep_incompats,
&state.pubgrub.incompatibility_store,
);
ForkedDependencies::Unforked(dependencies) => {
state.add_package_version_dependencies(
&version,
dependencies,
&prefetcher,
)?;
forked_states.push(state);
}
ForkedDependencies::Forked {
@ -565,21 +542,6 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
let mut cur_state = Some(state);
let forks_len = forks.len();
for (i, fork) in forks.into_iter().enumerate() {
if fork
.dependencies
.iter()
.any(|(dependency, _)| dependency == &package)
{
if enabled!(Level::DEBUG) {
prefetcher.log_tried_versions();
}
return Err(PubGrubError::SelfDependency {
package: package.clone(),
version: version.clone(),
}
.into());
}
let is_last = i == forks_len - 1;
let mut forked_state = cur_state.take().unwrap();
if !is_last {
@ -587,19 +549,11 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
}
forked_state.markers.and(fork.markers);
// Add that package and version if the dependencies are not problematic.
let dep_incompats =
forked_state.pubgrub.add_incompatibility_from_dependencies(
package.clone(),
version.clone(),
fork.dependencies,
);
forked_state.pubgrub.partial_solution.add_version(
package.clone(),
version.clone(),
dep_incompats,
&forked_state.pubgrub.incompatibility_store,
);
forked_state.add_package_version_dependencies(
&version,
fork.dependencies,
&prefetcher,
)?;
forked_states.push(forked_state);
}
}
@ -1573,6 +1527,34 @@ struct SolveState {
}
impl SolveState {
/// Add the dependencies for the selected version of the current package.
fn add_package_version_dependencies(
&mut self,
version: &Version,
dependencies: Vec<(PubGrubPackage, Range<Version>)>,
prefetcher: &BatchPrefetcher,
) -> Result<(), ResolveError> {
if dependencies
.iter()
.any(|(dependency, _)| dependency == &self.next)
{
if enabled!(Level::DEBUG) {
prefetcher.log_tried_versions();
}
return Err(PubGrubError::SelfDependency {
package: self.next.clone(),
version: version.clone(),
}
.into());
}
self.pubgrub.add_package_version_dependencies(
self.next.clone(),
version.clone(),
dependencies,
);
Ok(())
}
fn into_resolution(self) -> Resolution {
let solution = self.pubgrub.partial_solution.extract_solution();
let mut dependencies: FxHashMap<