Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 7 additions & 29 deletions crates/uv-pypi-types/src/metadata/metadata_resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl ResolutionMetadata {
.collect::<Box<_>>();
let dynamic = headers
.get_all_values("Dynamic")
.any(|field| field.eq_ignore_ascii_case("Version"));
.any(|field| field == "Version");

Ok(Self {
name,
Expand Down Expand Up @@ -112,15 +112,12 @@ impl ResolutionMetadata {
// If any of the fields we need are marked as dynamic, we can't use the `PKG-INFO` file.
let mut dynamic = false;
for field in headers.get_all_values("Dynamic") {
let field = field.as_str();
if field.eq_ignore_ascii_case("Requires-Python") {
return Err(MetadataError::DynamicField("Requires-Python"));
} else if field.eq_ignore_ascii_case("Requires-Dist") {
return Err(MetadataError::DynamicField("Requires-Dist"));
} else if field.eq_ignore_ascii_case("Provides-Extra") {
return Err(MetadataError::DynamicField("Provides-Extra"));
} else if field.eq_ignore_ascii_case("Version") {
dynamic = true;
match field.as_str() {
"Requires-Python" => return Err(MetadataError::DynamicField("Requires-Python")),
"Requires-Dist" => return Err(MetadataError::DynamicField("Requires-Dist")),
"Provides-Extra" => return Err(MetadataError::DynamicField("Provides-Extra")),
"Version" => dynamic = true,
_ => (),
}
}

Expand Down Expand Up @@ -337,25 +334,6 @@ mod tests {
let meta = ResolutionMetadata::parse_pkg_info(s.as_bytes()).unwrap_err();
assert!(matches!(meta, MetadataError::DynamicField("Requires-Dist")));

// Dynamic field values should be matched case-insensitively.
let s = "Metadata-Version: 2.3\nName: asdf\nVersion: 1.0\nDynamic: requires-dist";
let meta = ResolutionMetadata::parse_pkg_info(s.as_bytes()).unwrap_err();
assert!(matches!(meta, MetadataError::DynamicField("Requires-Dist")));

let s = "Metadata-Version: 2.3\nName: asdf\nVersion: 1.0\nDynamic: requires-python";
let meta = ResolutionMetadata::parse_pkg_info(s.as_bytes()).unwrap_err();
assert!(matches!(
meta,
MetadataError::DynamicField("Requires-Python")
));

let s = "Metadata-Version: 2.3\nName: asdf\nVersion: 1.0\nDynamic: provides-extra";
let meta = ResolutionMetadata::parse_pkg_info(s.as_bytes()).unwrap_err();
assert!(matches!(
meta,
MetadataError::DynamicField("Provides-Extra")
));

let s = "Metadata-Version: 2.3\nName: asdf\nVersion: 1.0\nRequires-Dist: foo";
let meta = ResolutionMetadata::parse_pkg_info(s.as_bytes()).unwrap();
assert_eq!(meta.name, PackageName::from_str("asdf").unwrap());
Expand Down
Loading