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

Add a `PubGrubRequirement` struct (#3553) 

## Summary

Formalize some of the patterns in here. No behavior changes, just moving
this method onto a struct.
This commit is contained in:
Charlie Marsh 2024-05-13 12:59:10 -04:00 committed by GitHub
parent eb8e733790
commit 10ec48299e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 132 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
crates/uv-resolver/src/pubgrub/dependencies.rs
View File

@ -91,14 +91,16 @@ fn add_requirements(
}
// Add the package, plus any extra variants.
for result in std::iter::once(to_pubgrub(requirement, None, urls, locals)).chain(
requirement
.extras
.clone()
.into_iter()
.map(|extra| to_pubgrub(requirement, Some(extra), urls, locals)),
) {
let (package, version) = result?;
for result in std::iter::once(PubGrubRequirement::from_requirement(
requirement,
None,
urls,
locals,
))
.chain(requirement.extras.clone().into_iter().map(|extra| {
PubGrubRequirement::from_requirement(requirement, Some(extra), urls, locals)
})) {
let PubGrubRequirement { package, version } = result?;
match &package {
PubGrubPackage::Package(name, ..) => {
@ -152,7 +154,8 @@ fn add_requirements(
}
// Add the package.
let (package, version) = to_pubgrub(constraint, None, urls, locals)?;
let PubGrubRequirement { package, version } =
PubGrubRequirement::from_constraint(constraint, urls, locals)?;
// Ignore self-dependencies.
if let PubGrubPackage::Package(name, ..) = &package {
@ -178,13 +181,21 @@ impl From<PubGrubDependencies> for Vec<(PubGrubPackage, Range<Version>)> {
}
}
/// A PubGrub-compatible package and version range.
#[derive(Debug, Clone)]
struct PubGrubRequirement {
package: PubGrubPackage,
version: Range<Version>,
}
impl PubGrubRequirement {
/// Convert a [`Requirement`] to a PubGrub-compatible package and range.
fn to_pubgrub(
pub(crate) fn from_requirement(
requirement: &Requirement,
extra: Option<ExtraName>,
urls: &Urls,
locals: &Locals,
) -> Result<(PubGrubPackage, Range<Version>), ResolveError> {
) -> Result<Self, ResolveError> {
match &requirement.source {
RequirementSource::Registry { specifier, .. } => {
// TODO(konsti): We're currently losing the index information here, but we need
@ -211,10 +222,10 @@ fn to_pubgrub(
})?
};
Ok((
PubGrubPackage::from_package(requirement.name.clone(), extra, urls),
Ok(Self {
package: PubGrubPackage::from_package(requirement.name.clone(), extra, urls),
version,
))
})
}
RequirementSource::Url { url, .. } => {
let Some(expected) = urls.get(&requirement.name) else {
@ -232,10 +243,14 @@ fn to_pubgrub(
));
}
Ok((
PubGrubPackage::Package(requirement.name.clone(), extra, Some(expected.clone())),
Range::full(),
))
Ok(Self {
package: PubGrubPackage::Package(
requirement.name.clone(),
extra,
Some(expected.clone()),
),
version: Range::full(),
})
}
RequirementSource::Git { url, .. } => {
let Some(expected) = urls.get(&requirement.name) else {
@ -253,10 +268,14 @@ fn to_pubgrub(
));
}
Ok((
PubGrubPackage::Package(requirement.name.clone(), extra, Some(expected.clone())),
Range::full(),
))
Ok(Self {
package: PubGrubPackage::Package(
requirement.name.clone(),
extra,
Some(expected.clone()),
),
version: Range::full(),
})
}
RequirementSource::Path { url, .. } => {
let Some(expected) = urls.get(&requirement.name) else {
@ -274,10 +293,24 @@ fn to_pubgrub(
));
}
Ok((
PubGrubPackage::Package(requirement.name.clone(), extra, Some(expected.clone())),
Range::full(),
))
Ok(Self {
package: PubGrubPackage::Package(
requirement.name.clone(),
extra,
Some(expected.clone()),
),
version: Range::full(),
})
}
}
}
/// Convert a constraint to a PubGrub-compatible package and range.
pub(crate) fn from_constraint(
constraint: &Requirement,
urls: &Urls,
locals: &Locals,
) -> Result<Self, ResolveError> {
Self::from_requirement(constraint, None, urls, locals)
}
}