mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-17 02:52:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove unnecessary requirements conversions (#4035)

Browse source
This commit is contained in:
Charlie Marsh 2024-06-04 21:52:16 -04:00 • committed by GitHub
parent 8de3e38b94
commit 27e5bfe397
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/uv-resolver/src/resolution/graph.rs
View file

@ -11,7 +11,7 @@ use distribution_types::{
};
use pep440_rs::{Version, VersionSpecifier};
use pep508_rs::{MarkerEnvironment, MarkerTree};
use pypi_types::{ParsedUrlError, Requirement, Yanked};
use pypi_types::{ParsedUrlError, Yanked};
use uv_git::GitResolver;
use uv_normalize::{ExtraName, PackageName};
@ -390,14 +390,7 @@ impl ResolutionGraph {
dist.version_id()
)
};
let requirements: Vec<_> = archive
.metadata
.requires_dist
.iter()
.cloned()
.map(Requirement::from)
.collect();
for req in manifest.apply(requirements.iter()) {
for req in manifest.apply(archive.metadata.requires_dist.iter()) {
let Some(ref marker_tree) = req.marker else {
continue;
};

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

@ -1048,14 +1048,8 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
}
};
let requirements: Vec<_> = metadata
.requires_dist
.iter()
.cloned()
.map(Requirement::from)
.collect();
let mut dependencies = PubGrubDependencies::from_requirements(
&requirements,
&metadata.requires_dist,
&self.constraints,
&self.overrides,
Some(name),