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

.

Browse source
This commit is contained in:
konstin 2025-07-03 23:24:14 +02:00
parent b64e28bb14
commit ff98ee3273
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1256,6 +1256,14 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
return Ok(None);
};
// If there is no `PrioritizedDist`, our candidate is an installed package.
if let Some(variants_json) = candidate
.prioritized()
.and_then(|prioritized_dist| prioritized_dist.variants_json())
{
&variants_json.file;
}
let dist = match candidate.dist() {
CandidateDist::Compatible(dist) => dist,
CandidateDist::Incompatible(incompatibility) => {

8
crates/uv-variant-frontend/src/lib.rs
View file

@ -81,11 +81,15 @@ impl VariantBuild {
let resolved_requirements = build_context
.resolve(&requirements, &BuildStack::empty())
.await
.map_err(|err| Error::RequirementsResolve("`build-system.requires`", err.into()))?;
.map_err(|err| {
Error::RequirementsResolve("`variant.providers.TODO(konsti).requires`", err.into())
})?;
build_context
.install(&resolved_requirements, &venv, &BuildStack::empty())
.await
.map_err(|err| Error::RequirementsInstall("`build-system.requires`", err.into()))?;
.map_err(|err| {
Error::RequirementsInstall("`variant.providers.TODO(konsti).requires`", err.into())
})?;
// Figure out what the modified path should be, and remove the PATH variable from the
// environment variables if it's there.