mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-03 18:38:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add provides-extras to lockfile (#11063)

Browse source 
Fixes #10953
This commit is contained in:
Aria Desires 2025-02-11 14:38:38 -05:00 • committed by Zanie Blue
parent e0d5e2e789
commit 49e10435f1
33 changed files with 1233 additions and 654 deletions
Download patch file Download diff file Expand all files Collapse all files

64
crates/uv-resolver/src/lock/mod.rs
View file

@ -981,6 +981,7 @@ impl Lock {
.metadata
.requires_dist
.iter()
.flatten()
.cloned()
.map(|requirement| normalize_requirement(requirement, root))
.collect::<Result<_, _>>()?;
@ -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()
@ -1820,6 +1835,7 @@ impl Package {
dependency_groups: BTreeMap::default(),
metadata: PackageMetadata {
requires_dist,
provides_extras,
dependency_groups,
},
})
@ -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(
@ -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: BTreeSet<Requirement>,
requires_dist: Option<BTreeSet<Requirement>>,
#[serde(default)]
provides_extras: Option<Vec<ExtraName>>,
#[serde(default, rename = "requires-dev", alias = "dependency-groups")]
dependency_groups: BTreeMap<GroupName, BTreeSet<Requirement>>,
}

3
crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_missing.snap
View file

@ -86,7 +86,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},

3
crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_present.snap
View file

@ -93,7 +93,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},

3
crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_required_present.snap
View file

@ -89,7 +89,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},

6
crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_source_unambiguous.snap
View file

@ -79,7 +79,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
@ -148,7 +149,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},

6
crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_source_version_unambiguous.snap
View file

@ -79,7 +79,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
@ -148,7 +149,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},

6
crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_version_unambiguous.snap
View file

@ -79,7 +79,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
@ -148,7 +149,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},

3
crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_direct_has_subdir.snap
View file

@ -63,7 +63,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},

3
crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_direct_no_subdir.snap
View file

@ -61,7 +61,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},

3
crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_directory.snap
View file

@ -56,7 +56,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},

3
crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_editable.snap
View file

@ -56,7 +56,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},