Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary requirements conversions (#4035)

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/uv-requirements/src/lookahead.rs
View File

@ -192,13 +192,7 @@ impl<'a, Context: BuildContext> LookaheadResolver<'a, Context> {
}) })
{ {
// If the metadata is already in the index, return it. // If the metadata is already in the index, return it.
archive archive.metadata.requires_dist.clone()
.metadata
.requires_dist
.iter()
.cloned()
.map(Requirement::from)
.collect()
} else { } else {
// Run the PEP 517 build process to extract metadata from the source distribution. // Run the PEP 517 build process to extract metadata from the source distribution.
let archive = self let archive = self
@ -219,7 +213,7 @@ impl<'a, Context: BuildContext> LookaheadResolver<'a, Context> {
.distributions() .distributions()
.done(id, Arc::new(MetadataResponse::Found(archive))); .done(id, Arc::new(MetadataResponse::Found(archive)));
requires_dist.into_iter().map(Requirement::from).collect() requires_dist
} }
}; };

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

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