Skip to content

Commit

Permalink
add provides-extras to lockfile (#11063)
Browse files Browse the repository at this point in the history 
Fixes #10953
  • Loading branch information
@Gankra @zanieb
Gankra authored and zanieb committed Feb 13, 2025
1 parent b6f8d3c commit 25e4841
Show file tree
Hide file tree
Showing 33 changed files with 1,233 additions and 654 deletions.
64 changes: 48 additions & 16 deletions crates/uv-resolver/src/lock/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -981,6 +981,7 @@ impl Lock {
.metadata
.requires_dist
.iter()
.flatten()
.cloned()
.map(|requirement| normalize_requirement(requirement, root))
.collect::<Result<_, _>>()?;
Expand Down Expand Up @@ -1777,18 +1778,32 @@ impl Package {
let sdist = SourceDist::from_annotated_dist(&id, annotated_dist)?;
let wheels = Wheel::from_annotated_dist(annotated_dist)?;
let requires_dist = if id.source.is_immutable() {
BTreeSet::default()
None
} else {
annotated_dist
.metadata
.as_ref()
.expect("metadata is present")
.requires_dist
.iter()
.cloned()
.map(|requirement| requirement.relative_to(root))
.collect::<Result<_, _>>()
.map_err(LockErrorKind::RequirementRelativePath)?
Some(
annotated_dist
.metadata
.as_ref()
.expect("metadata is present")
.requires_dist
.iter()
.cloned()
.map(|requirement| requirement.relative_to(root))
.collect::<Result<_, _>>()
.map_err(LockErrorKind::RequirementRelativePath)?,
)
};
let provides_extras = if id.source.is_immutable() {
None
} else {
Some(
annotated_dist
.metadata
.as_ref()
.expect("metadata is present")
.provides_extras
.clone(),
)
};
let dependency_groups = if id.source.is_immutable() {
BTreeMap::default()
Expand Down Expand Up @@ -1820,6 +1835,7 @@ impl Package {
dependency_groups: BTreeMap::default(),
metadata: PackageMetadata {
requires_dist,
provides_extras,
dependency_groups,
},
})
Expand Down Expand Up @@ -2402,10 +2418,22 @@ impl Package {
{
let mut metadata_table = Table::new();

if !self.metadata.requires_dist.is_empty() {
let requires_dist = self
.metadata
.requires_dist
// Even output the empty list to signal it's *known* empty.
if let Some(provides_extras) = &self.metadata.provides_extras {
let provides_extras = provides_extras
.iter()
.map(|extra| {
serde::Serialize::serialize(&extra, toml_edit::ser::ValueSerializer::new())
})
.collect::<Result<Vec<_>, _>>()?;
// This is just a list of names, so linebreaking it is excessive.
let provides_extras = Array::from_iter(provides_extras);
metadata_table.insert("provides-extras", value(provides_extras));
}

// Even output the empty set to signal it's *known* empty.
if let Some(requires_dist) = &self.metadata.requires_dist {
let requires_dist = requires_dist
.iter()
.map(|requirement| {
serde::Serialize::serialize(
Expand Down Expand Up @@ -2632,8 +2660,12 @@ struct PackageWire {
#[derive(Clone, Default, Debug, Eq, PartialEq, serde::Deserialize)]
#[serde(rename_all = "kebab-case")]
struct PackageMetadata {
// The Options here are so we can distinguish "no info available"
// from "known and empty".
#[serde(default)]
requires_dist: Option<BTreeSet<Requirement>>,
#[serde(default)]
requires_dist: BTreeSet<Requirement>,
provides_extras: Option<Vec<ExtraName>>,
#[serde(default, rename = "requires-dev", alias = "dependency-groups")]
dependency_groups: BTreeMap<GroupName, BTreeSet<Requirement>>,
}
Expand Down
3 changes: 2 additions & 1 deletion crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_missing.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down
3 changes: 2 additions & 1 deletion crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_present.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down
3 changes: 2 additions & 1 deletion crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_required_present.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down
6 changes: 4 additions & 2 deletions ...r/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_source_unambiguous.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down Expand Up @@ -148,7 +149,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down
6 changes: 4 additions & 2 deletions ...ck/snapshots/uv_resolver__lock__tests__missing_dependency_source_version_unambiguous.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down Expand Up @@ -148,7 +149,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down
6 changes: 4 additions & 2 deletions .../src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_version_unambiguous.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down Expand Up @@ -148,7 +149,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down
3 changes: 2 additions & 1 deletion ...es/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_direct_has_subdir.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down
3 changes: 2 additions & 1 deletion crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_direct_no_subdir.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down
3 changes: 2 additions & 1 deletion crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_directory.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down
3 changes: 2 additions & 1 deletion crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_editable.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down
Loading

0 comments on commit 25e4841

Please sign in to comment.