mirror of https://github.com/astral-sh/uv
Remove unnecessary requirements conversions (#4035)
This commit is contained in:
parent
8de3e38b94
commit
27e5bfe397
|
|
@ -192,13 +192,7 @@ impl<'a, Context: BuildContext> LookaheadResolver<'a, Context> {
|
|||
})
|
||||
{
|
||||
// If the metadata is already in the index, return it.
|
||||
archive
|
||||
.metadata
|
||||
.requires_dist
|
||||
.iter()
|
||||
.cloned()
|
||||
.map(Requirement::from)
|
||||
.collect()
|
||||
archive.metadata.requires_dist.clone()
|
||||
} else {
|
||||
// Run the PEP 517 build process to extract metadata from the source distribution.
|
||||
let archive = self
|
||||
|
|
@ -219,7 +213,7 @@ impl<'a, Context: BuildContext> LookaheadResolver<'a, Context> {
|
|||
.distributions()
|
||||
.done(id, Arc::new(MetadataResponse::Found(archive)));
|
||||
|
||||
requires_dist.into_iter().map(Requirement::from).collect()
|
||||
requires_dist
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
|
|
|
|||
Loading…
Reference in New Issue