Rename provides_extras to provides_extra (#15825)

## Summary

This is now consistent with `requires_dist` (singular).

Author: charliermarsh

crates/uv-build-backend/src/metadata.rs

@@ -547,7 +547,7 @@ impl PyProjectToml {
             license_files,
             classifiers: self.project.classifiers.clone().unwrap_or_default(),
             requires_dist: requires_dist.iter().map(ToString::to_string).collect(),
-            provides_extras: extras.iter().map(ToString::to_string).collect(),
+            provides_extra: extras.iter().map(ToString::to_string).collect(),
             // Not commonly set.
             provides_dist: vec![],
             // Not supported.

crates/uv-cache/src/lib.rs

@@ -1002,7 +1002,7 @@ impl CacheBucket {
             Self::Interpreter => "interpreter-v4",
             // Note that when bumping this, you'll also need to bump it
             // in `crates/uv/tests/it/cache_clean.rs`.
-            Self::Simple => "simple-v17",
+            Self::Simple => "simple-v18",
             // Note that when bumping this, you'll also need to bump it
             // in `crates/uv/tests/it/cache_prune.rs`.
             Self::Wheels => "wheels-v5",

crates/uv-client/src/registry_client.rs

@@ -1245,7 +1245,7 @@ impl SimpleMetadata {
                                 version: version.clone(),
                                 requires_dist: metadata.requires_dist,
                                 requires_python: metadata.requires_python,
-                                provides_extras: metadata.provides_extras,
+                                provides_extra: metadata.provides_extra,
                                 dynamic: false,
                             });
                     SimpleMetadatum {

crates/uv-distribution-types/src/dependency_metadata.rs

@@ -49,7 +49,7 @@ impl DependencyMetadata {
                 version: version.clone(),
                 requires_dist: metadata.requires_dist.clone(),
                 requires_python: metadata.requires_python.clone(),
-                provides_extras: metadata.provides_extras.clone(),
+                provides_extra: metadata.provides_extra.clone(),
                 dynamic: false,
             })
         } else {
@@ -70,7 +70,7 @@ impl DependencyMetadata {
                 version,
                 requires_dist: metadata.requires_dist.clone(),
                 requires_python: metadata.requires_python.clone(),
-                provides_extras: metadata.provides_extras.clone(),
+                provides_extra: metadata.provides_extra.clone(),
                 dynamic: false,
             })
         }
@@ -109,6 +109,6 @@ pub struct StaticMetadata {
         )
     )]
     pub requires_python: Option<VersionSpecifiers>,
-    #[serde(default)]
-    pub provides_extras: Box<[ExtraName]>,
+    #[serde(default, alias = "provides-extras")]
+    pub provides_extra: Box<[ExtraName]>,
 }

crates/uv-distribution/src/metadata/mod.rs

@@ -58,7 +58,7 @@ pub struct Metadata {
     // Optional fields
     pub requires_dist: Box<[Requirement]>,
     pub requires_python: Option<VersionSpecifiers>,
-    pub provides_extras: Box<[ExtraName]>,
+    pub provides_extra: Box<[ExtraName]>,
     pub dependency_groups: BTreeMap<GroupName, Box<[Requirement]>>,
     pub dynamic: bool,
 }
@@ -74,7 +74,7 @@ impl Metadata {
                 .map(Requirement::from)
                 .collect(),
             requires_python: metadata.requires_python,
-            provides_extras: metadata.provides_extras,
+            provides_extra: metadata.provides_extra,
             dependency_groups: BTreeMap::default(),
             dynamic: metadata.dynamic,
         }
@@ -94,13 +94,13 @@ impl Metadata {
         let requires_dist = uv_pypi_types::RequiresDist {
             name: metadata.name,
             requires_dist: metadata.requires_dist,
-            provides_extras: metadata.provides_extras,
+            provides_extra: metadata.provides_extra,
             dynamic: metadata.dynamic,
         };
         let RequiresDist {
             name,
             requires_dist,
-            provides_extras,
+            provides_extra,
             dependency_groups,
             dynamic,
         } = RequiresDist::from_project_maybe_workspace(
@@ -119,7 +119,7 @@ impl Metadata {
             version: metadata.version,
             requires_dist,
             requires_python: metadata.requires_python,
-            provides_extras,
+            provides_extra,
             dependency_groups,
             dynamic,
         })

crates/uv-distribution/src/metadata/requires_dist.rs

@@ -19,7 +19,7 @@ use crate::metadata::{GitWorkspaceMember, LoweredRequirement, MetadataError};
 pub struct RequiresDist {
     pub name: PackageName,
     pub requires_dist: Box<[Requirement]>,
-    pub provides_extras: Box<[ExtraName]>,
+    pub provides_extra: Box<[ExtraName]>,
     pub dependency_groups: BTreeMap<GroupName, Box<[Requirement]>>,
     pub dynamic: bool,
 }
@@ -33,7 +33,7 @@ impl RequiresDist {
             requires_dist: Box::into_iter(metadata.requires_dist)
                 .map(Requirement::from)
                 .collect(),
-            provides_extras: metadata.provides_extras,
+            provides_extra: metadata.provides_extra,
             dependency_groups: BTreeMap::default(),
             dynamic: metadata.dynamic,
         }
@@ -198,7 +198,7 @@ impl RequiresDist {
             name: metadata.name,
             requires_dist,
             dependency_groups,
-            provides_extras: metadata.provides_extras,
+            provides_extra: metadata.provides_extra,
             dynamic: metadata.dynamic,
         })
     }
@@ -216,7 +216,7 @@ impl RequiresDist {
             for source in sources.iter() {
                 if let Some(extra) = source.extra() {
                     // If the extra doesn't exist at all, error.
-                    if !metadata.provides_extras.contains(extra) {
+                    if !metadata.provides_extra.contains(extra) {
                         return Err(MetadataError::MissingSourceExtra(
                             name.clone(),
                             extra.clone(),
@@ -268,7 +268,7 @@ impl From<Metadata> for RequiresDist {
         Self {
             name: metadata.name,
             requires_dist: metadata.requires_dist,
-            provides_extras: metadata.provides_extras,
+            provides_extra: metadata.provides_extra,
             dependency_groups: metadata.dependency_groups,
             dynamic: metadata.dynamic,
         }

crates/uv-publish/src/lib.rs

@@ -746,7 +746,7 @@ impl FormMetadata {
             requires_python,
             requires_external,
             project_urls,
-            provides_extras,
+            provides_extra,
             dynamic,
         } = metadata(file, filename).await?;
 
@@ -808,7 +808,7 @@ impl FormMetadata {
         add_vec("platform", platforms);
         add_vec("project_urls", project_urls);
         add_vec("provides_dist", provides_dist);
-        add_vec("provides_extra", provides_extras);
+        add_vec("provides_extra", provides_extra);
         add_vec("requires_dist", requires_dist);
         add_vec("requires_external", requires_external);
 

crates/uv-pypi-types/src/metadata/metadata23.rs

@@ -99,7 +99,7 @@ pub struct Metadata23 {
     /// A string containing the name of an optional feature. Must be a valid Python identifier.
     /// May be used to make a dependency conditional on whether the optional feature has been
     /// requested.
-    pub provides_extras: Vec<String>,
+    pub provides_extra: Vec<String>,
     /// A string containing the name of another core metadata field.
     pub dynamic: Vec<String>,
 }
@@ -145,7 +145,7 @@ impl Metadata23 {
         let requires_python = headers.get_first_value("Requires-Python");
         let requires_external = headers.get_all_values("Requires-External").collect();
         let project_urls = headers.get_all_values("Project-URL").collect();
-        let provides_extras = headers.get_all_values("Provides-Extra").collect();
+        let provides_extra = headers.get_all_values("Provides-Extra").collect();
         let description_content_type = headers.get_first_value("Description-Content-Type");
         let dynamic = headers.get_all_values("Dynamic").collect();
         Ok(Self {
@@ -174,7 +174,7 @@ impl Metadata23 {
             requires_python,
             requires_external,
             project_urls,
-            provides_extras,
+            provides_extra,
             dynamic,
         })
     }
@@ -264,7 +264,7 @@ impl Metadata23 {
         );
         write_all(&mut writer, "Requires-External", &self.requires_external);
         write_all(&mut writer, "Project-URL", &self.project_urls);
-        write_all(&mut writer, "Provides-Extra", &self.provides_extras);
+        write_all(&mut writer, "Provides-Extra", &self.provides_extra);
         write_opt_str(
             &mut writer,
             "Description-Content-Type",

crates/uv-pypi-types/src/metadata/metadata_resolver.rs

@@ -31,7 +31,8 @@ pub struct ResolutionMetadata {
     // Optional fields
     pub requires_dist: Box<[Requirement<VerbatimParsedUrl>]>,
     pub requires_python: Option<VersionSpecifiers>,
-    pub provides_extras: Box<[ExtraName]>,
+    #[serde(alias = "provides-extras")]
+    pub provides_extra: Box<[ExtraName]>,
     /// Whether the version field is dynamic.
     #[serde(default)]
     pub dynamic: bool,
@@ -64,7 +65,7 @@ impl ResolutionMetadata {
             .map(|requires_python| LenientVersionSpecifiers::from_str(&requires_python))
             .transpose()?
             .map(VersionSpecifiers::from);
-        let provides_extras = headers
+        let provides_extra = headers
             .get_all_values("Provides-Extra")
             .filter_map(
                 |provides_extra| match ExtraName::from_owned(provides_extra) {
@@ -85,7 +86,7 @@ impl ResolutionMetadata {
             version,
             requires_dist,
             requires_python,
-            provides_extras,
+            provides_extra,
             dynamic,
         })
     }
@@ -144,7 +145,7 @@ impl ResolutionMetadata {
             .map(|requires_python| LenientVersionSpecifiers::from_str(&requires_python))
             .transpose()?
             .map(VersionSpecifiers::from);
-        let provides_extras = headers
+        let provides_extra = headers
             .get_all_values("Provides-Extra")
             .filter_map(
                 |provides_extra| match ExtraName::from_owned(provides_extra) {
@@ -162,7 +163,7 @@ impl ResolutionMetadata {
             version,
             requires_dist,
             requires_python,
-            provides_extras,
+            provides_extra,
             dynamic,
         })
     }
@@ -250,7 +251,7 @@ impl ResolutionMetadata {
             .collect::<Result<Box<_>, _>>()?;
 
         // Extract the optional dependencies.
-        let provides_extras = project
+        let provides_extra = project
             .optional_dependencies
             .unwrap_or_default()
             .into_keys()
@@ -261,7 +262,7 @@ impl ResolutionMetadata {
             version,
             requires_dist,
             requires_python,
-            provides_extras,
+            provides_extra,
             dynamic,
         })
     }
@@ -370,7 +371,7 @@ mod tests {
         assert_eq!(meta.version, Version::new([1, 0]));
         assert!(meta.requires_python.is_none());
         assert!(meta.requires_dist.is_empty());
-        assert!(meta.provides_extras.is_empty());
+        assert!(meta.provides_extra.is_empty());
 
         let s = r#"
         [project]
@@ -384,7 +385,7 @@ mod tests {
         assert_eq!(meta.version, Version::new([1, 0]));
         assert_eq!(meta.requires_python, Some(">=3.6".parse().unwrap()));
         assert!(meta.requires_dist.is_empty());
-        assert!(meta.provides_extras.is_empty());
+        assert!(meta.provides_extra.is_empty());
 
         let s = r#"
         [project]
@@ -399,7 +400,7 @@ mod tests {
         assert_eq!(meta.version, Version::new([1, 0]));
         assert_eq!(meta.requires_python, Some(">=3.6".parse().unwrap()));
         assert_eq!(*meta.requires_dist, ["foo".parse().unwrap()]);
-        assert!(meta.provides_extras.is_empty());
+        assert!(meta.provides_extra.is_empty());
 
         let s = r#"
         [project]
@@ -423,6 +424,6 @@ mod tests {
                 "bar; extra == \"dotenv\"".parse().unwrap()
             ]
         );
-        assert_eq!(*meta.provides_extras, ["dotenv".parse().unwrap()]);
+        assert_eq!(*meta.provides_extra, ["dotenv".parse().unwrap()]);
     }
 }

crates/uv-pypi-types/src/metadata/requires_dist.rs

@@ -1,7 +1,6 @@
 use std::str::FromStr;
 
 use itertools::Itertools;
-use serde::{Deserialize, Serialize};
 
 use uv_normalize::{ExtraName, PackageName};
 use uv_pep508::Requirement;
@@ -15,13 +14,11 @@ use crate::{LenientRequirement, MetadataError, VerbatimParsedUrl};
 /// This is a subset of [`ResolutionMetadata`]; specifically, it omits the `version` and `requires-python`
 /// fields, which aren't necessary when extracting the requirements of a package without installing
 /// the package itself.
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(rename_all = "kebab-case")]
+#[derive(Debug, Clone)]
 pub struct RequiresDist {
     pub name: PackageName,
     pub requires_dist: Box<[Requirement<VerbatimParsedUrl>]>,
-    pub provides_extras: Box<[ExtraName]>,
-    #[serde(default)]
+    pub provides_extra: Box<[ExtraName]>,
     pub dynamic: bool,
 }
 
@@ -86,7 +83,7 @@ impl RequiresDist {
             .collect::<Result<Box<_>, _>>()?;
 
         // Extract the optional dependencies.
-        let provides_extras = project
+        let provides_extra = project
             .optional_dependencies
             .unwrap_or_default()
             .into_keys()
@@ -95,7 +92,7 @@ impl RequiresDist {
         Ok(Self {
             name,
             requires_dist,
-            provides_extras,
+            provides_extra,
             dynamic,
         })
     }