Add --group support to uv add and uv remove

Author: zanieb

crates/uv-cli/src/lib.rs

@@ -14,7 +14,7 @@ use uv_configuration::{
     TargetTriple, TrustedHost, TrustedPublishing, VersionControlSystem,
 };
 use uv_distribution_types::{FlatIndexLocation, IndexUrl};
-use uv_normalize::{ExtraName, PackageName};
+use uv_normalize::{ExtraName, GroupName, PackageName};
 use uv_pep508::Requirement;
 use uv_pypi_types::VerbatimParsedUrl;
 use uv_python::{PythonDownloads, PythonPreference, PythonVersion};
@@ -2877,7 +2877,7 @@ pub struct AddArgs {
     pub requirements: Vec<PathBuf>,
 
     /// Add the requirements as development dependencies.
-    #[arg(long, conflicts_with("optional"))]
+    #[arg(long, conflicts_with("optional"), conflicts_with("group"))]
     pub dev: bool,
 
     /// Add the requirements to the specified optional dependency group.
@@ -2887,9 +2887,15 @@ pub struct AddArgs {
     ///
     /// To enable an optional dependency group for this requirement instead, see
     /// `--extra`.
-    #[arg(long, conflicts_with("dev"))]
+    #[arg(long, conflicts_with("dev"), conflicts_with("group"))]
     pub optional: Option<ExtraName>,
 
+    /// Add the requirements to the specified local dependency group.
+    ///
+    /// These requirements will not be included in the published metadata for the project.
+    #[arg(long, conflicts_with("dev"), conflicts_with("optional"))]
+    pub group: Option<GroupName>,
+
     /// Add the requirements as editable.
     #[arg(long, overrides_with = "no_editable")]
     pub editable: bool,
@@ -2995,13 +3001,17 @@ pub struct RemoveArgs {
     pub packages: Vec<PackageName>,
 
     /// Remove the packages from the development dependencies.
-    #[arg(long, conflicts_with("optional"))]
+    #[arg(long, conflicts_with("optional"), conflicts_with("group"))]
     pub dev: bool,
 
     /// Remove the packages from the specified optional dependency group.
-    #[arg(long, conflicts_with("dev"))]
+    #[arg(long, conflicts_with("dev"), conflicts_with("group"))]
     pub optional: Option<ExtraName>,
 
+    /// Remove the packages from the specified local dependency group.
+    #[arg(long, conflicts_with("dev"), conflicts_with("optional"))]
+    pub group: Option<GroupName>,
+
     /// Avoid syncing the virtual environment after re-locking the project.
     #[arg(long, env = "UV_NO_SYNC", value_parser = clap::builder::BoolishValueParser::new(), conflicts_with = "frozen")]
     pub no_sync: bool,

crates/uv-configuration/src/dev.rs

@@ -1,5 +1,5 @@
 use either::Either;
-use uv_normalize::GroupName;
+use uv_normalize::{GroupName, DEV_DEPENDENCIES};
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
 pub enum DevMode {
@@ -27,17 +27,17 @@ impl DevMode {
     }
 }
 
-#[derive(Debug, Copy, Clone)]
-pub enum DevSpecification<'group> {
+#[derive(Debug, Clone)]
+pub enum DevSpecification {
     /// Include dev dependencies from the specified group.
-    Include(&'group [GroupName]),
+    Include(Vec<GroupName>),
     /// Do not include dev dependencies.
     Exclude,
-    /// Include dev dependencies from the specified group, and exclude all non-dev dependencies.
-    Only(&'group [GroupName]),
+    /// Include dev dependencies from the specified groups, and exclude all non-dev dependencies.
+    Only(Vec<GroupName>),
 }
 
-impl<'group> DevSpecification<'group> {
+impl DevSpecification {
     /// Returns an [`Iterator`] over the group names to include.
     pub fn iter(&self) -> impl Iterator<Item = &GroupName> {
         match self {
@@ -51,3 +51,13 @@ impl<'group> DevSpecification<'group> {
         matches!(self, Self::Exclude | Self::Include(_))
     }
 }
+
+impl From<DevMode> for DevSpecification {
+    fn from(mode: DevMode) -> Self {
+        match mode {
+            DevMode::Include => Self::Include(vec![DEV_DEPENDENCIES.clone()]),
+            DevMode::Exclude => Self::Exclude,
+            DevMode::Only => Self::Only(vec![DEV_DEPENDENCIES.clone()]),
+        }
+    }
+}

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

@@ -6,7 +6,8 @@ use thiserror::Error;
 use uv_configuration::SourceStrategy;
 use uv_normalize::{ExtraName, GroupName, PackageName};
 use uv_pep440::{Version, VersionSpecifiers};
-use uv_pypi_types::{HashDigest, ResolutionMetadata};
+use uv_pep508::Pep508Error;
+use uv_pypi_types::{HashDigest, ResolutionMetadata, VerbatimParsedUrl};
 use uv_workspace::WorkspaceError;
 
 pub use crate::metadata::lowering::LoweredRequirement;
@@ -22,8 +23,12 @@ pub enum MetadataError {
     Workspace(#[from] WorkspaceError),
     #[error("Failed to parse entry for: `{0}`")]
     LoweringError(PackageName, #[source] LoweringError),
-    #[error(transparent)]
-    Lower(#[from] LoweringError),
+    #[error("Failed to parse entry for: `{0}`")]
+    GroupRequirementError(
+        GroupName,
+        String,
+        #[source] Box<Pep508Error<VerbatimParsedUrl>>,
+    ),
 }
 
 #[derive(Debug, Clone)]

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

@@ -3,8 +3,10 @@ use crate::Metadata;
 
 use std::collections::BTreeMap;
 use std::path::Path;
+use std::str::FromStr;
 use uv_configuration::SourceStrategy;
 use uv_normalize::{ExtraName, GroupName, PackageName, DEV_DEPENDENCIES};
+use uv_pypi_types::VerbatimParsedUrl;
 use uv_workspace::pyproject::ToolUvSources;
 use uv_workspace::{DiscoveryOptions, ProjectWorkspace};
 
@@ -72,7 +74,7 @@ impl RequiresDist {
         };
 
         let dev_dependencies = {
-            let dev_dependencies = project_workspace
+            let dev_dependencies: Vec<_> = project_workspace
                 .current_project()
                 .pyproject_toml()
                 .tool
@@ -81,36 +83,77 @@ impl RequiresDist {
                 .and_then(|uv| uv.dev_dependencies.as_ref())
                 .into_iter()
                 .flatten()
-                .cloned();
-            let dev_dependencies = match source_strategy {
-                SourceStrategy::Enabled => dev_dependencies
-                    .flat_map(|requirement| {
-                        let requirement_name = requirement.name.clone();
-                        LoweredRequirement::from_requirement(
-                            requirement,
-                            &metadata.name,
-                            project_workspace.project_root(),
-                            sources,
-                            project_workspace.workspace(),
-                        )
-                        .map(move |requirement| match requirement {
-                            Ok(requirement) => Ok(requirement.into_inner()),
-                            Err(err) => {
-                                Err(MetadataError::LoweringError(requirement_name.clone(), err))
-                            }
-                        })
-                    })
-                    .collect::<Result<Vec<_>, _>>()?,
-                SourceStrategy::Disabled => dev_dependencies
-                    .into_iter()
-                    .map(uv_pypi_types::Requirement::from)
-                    .collect(),
-            };
-            if dev_dependencies.is_empty() {
-                BTreeMap::default()
-            } else {
-                BTreeMap::from([(DEV_DEPENDENCIES.clone(), dev_dependencies)])
-            }
+                .cloned()
+                .collect();
+
+            let dependency_groups = project_workspace
+                .current_project()
+                .pyproject_toml()
+                .dependency_groups
+                .iter()
+                .flatten()
+                .map(|(name, requirements)| {
+                    (
+                        name.clone(),
+                        requirements
+                            .iter()
+                            .map(|requirement| {
+                                match uv_pep508::Requirement::<VerbatimParsedUrl>::from_str(
+                                    requirement,
+                                ) {
+                                    Ok(requirement) => Ok(requirement),
+                                    Err(err) => Err(MetadataError::GroupRequirementError(
+                                        name.clone(),
+                                        requirement.clone(),
+                                        Box::new(err),
+                                    )),
+                                }
+                            })
+                            .collect::<Result<Vec<_>, _>>(),
+                    )
+                })
+                .chain(std::iter::once((
+                    DEV_DEPENDENCIES.clone(),
+                    Ok(dev_dependencies),
+                )))
+                .map(|(name, requirements)| {
+                    let requirements = match requirements {
+                        Ok(requirements) => match source_strategy {
+                            SourceStrategy::Enabled => requirements
+                                .into_iter()
+                                .flat_map(|requirement| {
+                                    let requirement_name = requirement.name.clone();
+                                    LoweredRequirement::from_requirement(
+                                        requirement,
+                                        &metadata.name,
+                                        project_workspace.project_root(),
+                                        sources,
+                                        project_workspace.workspace(),
+                                    )
+                                    .map(move |requirement| {
+                                        match requirement {
+                                            Ok(requirement) => Ok(requirement.into_inner()),
+                                            Err(err) => Err(MetadataError::LoweringError(
+                                                requirement_name.clone(),
+                                                err,
+                                            )),
+                                        }
+                                    })
+                                })
+                                .collect::<Result<Vec<_>, _>>(),
+                            SourceStrategy::Disabled => Ok(requirements
+                                .into_iter()
+                                .map(uv_pypi_types::Requirement::from)
+                                .collect()),
+                        },
+                        Err(err) => Err(err),
+                    };
+                    // TODO(zanieb): Rewrite this to raise the error correctly
+                    (name, requirements.unwrap())
+                })
+                .collect::<BTreeMap<_, _>>();
+
+            dependency_groups
         };
 
         let requires_dist = metadata.requires_dist.into_iter();

crates/uv-normalize/src/group_name.rs

@@ -3,7 +3,7 @@ use std::fmt::{Display, Formatter};
 use std::str::FromStr;
 use std::sync::LazyLock;
 
-use serde::{Deserialize, Deserializer};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 use crate::{validate_and_normalize_owned, validate_and_normalize_ref, InvalidNameError};
 
@@ -41,6 +41,15 @@ impl<'de> Deserialize<'de> for GroupName {
     }
 }
 
+impl Serialize for GroupName {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.0.serialize(serializer)
+    }
+}
+
 impl Display for GroupName {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         self.0.fmt(f)

crates/uv-resolver/src/lock/mod.rs

@@ -551,7 +551,7 @@ impl Lock {
         marker_env: &ResolverMarkerEnvironment,
         tags: &Tags,
         extras: &ExtrasSpecification,
-        dev: DevSpecification<'_>,
+        dev: &DevSpecification,
         build_options: &BuildOptions,
         install_options: &InstallOptions,
     ) -> Result<Resolution, LockError> {

crates/uv-resolver/src/lock/requirements_txt.rs

@@ -43,7 +43,7 @@ impl<'lock> RequirementsTxtExport<'lock> {
         lock: &'lock Lock,
         root_name: &PackageName,
         extras: &ExtrasSpecification,
-        dev: DevSpecification<'_>,
+        dev: &DevSpecification,
         editable: EditableMode,
         hashes: bool,
         install_options: &'lock InstallOptions,

crates/uv-workspace/src/pyproject.rs

@@ -19,7 +19,7 @@ use url::Url;
 use uv_fs::{relative_to, PortablePathBuf};
 use uv_git::GitReference;
 use uv_macros::OptionsMetadata;
-use uv_normalize::{ExtraName, PackageName};
+use uv_normalize::{ExtraName, GroupName, PackageName};
 use uv_pep440::{Version, VersionSpecifiers};
 use uv_pep508::MarkerTree;
 use uv_pypi_types::{RequirementSource, SupportedEnvironments, VerbatimParsedUrl};
@@ -44,7 +44,7 @@ pub struct PyProjectToml {
     /// Tool-specific metadata.
     pub tool: Option<Tool>,
     /// Non-project dependency groups, as defined in PEP 735.
-    pub dependency_groups: Option<BTreeMap<ExtraName, Vec<String>>>,
+    pub dependency_groups: Option<BTreeMap<GroupName, Vec<String>>>,
     /// The raw unserialized document.
     #[serde(skip)]
     pub raw: String,
@@ -1056,7 +1056,7 @@ pub enum DependencyType {
     /// A dependency in `project.optional-dependencies.{0}`.
     Optional(ExtraName),
     /// A dependency in `dependency-groups.{0}`.
-    Group(ExtraName),
+    Group(GroupName),
 }
 
 /// <https://github.com/serde-rs/serde/issues/1316#issue-332908452>