Skip to content

Commit

Permalink
Make --no-default-groups works with --all-groups
Browse files Browse the repository at this point in the history
  • Loading branch information
@j178
j178 committed Jan 24, 2025
1 parent 6e4845f commit 350df16
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 79 deletions.
16 changes: 8 additions & 8 deletions crates/uv-cli/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2722,7 +2722,7 @@ pub struct RunArgs {
/// Exclude dependencies from default groups.
///
/// `--group` can be used to include specific groups.
#[arg(long, conflicts_with_all = ["no_group", "only_group"])]
#[arg(long, conflicts_with_all = ["only_group"])]
pub no_default_groups: bool,

/// Only include dependencies from the specified dependency group.
Expand All @@ -2736,7 +2736,7 @@ pub struct RunArgs {
/// Include dependencies from all dependency groups.
///
/// `--no-group` can be used to exclude specific groups.
#[arg(long, conflicts_with_all = [ "group", "only_group" ])]
#[arg(long, conflicts_with_all = ["group", "only_group"])]
pub all_groups: bool,

/// Run a Python module.
Expand Down Expand Up @@ -2993,7 +2993,7 @@ pub struct SyncArgs {
/// Exclude dependencies from default groups.
///
/// `--group` can be used to include specific groups.
#[arg(long, conflicts_with_all = ["no_group", "only_group"])]
#[arg(long, conflicts_with_all = ["only_group"])]
pub no_default_groups: bool,

/// Only include dependencies from the specified dependency group.
Expand All @@ -3007,7 +3007,7 @@ pub struct SyncArgs {
/// Include dependencies from all dependency groups.
///
/// `--no-group` can be used to exclude specific groups.
#[arg(long, conflicts_with_all = [ "group", "only_group" ])]
#[arg(long, conflicts_with_all = ["group", "only_group"])]
pub all_groups: bool,

/// Install any editable dependencies, including the project and any workspace members, as
Expand Down Expand Up @@ -3444,7 +3444,7 @@ pub struct TreeArgs {
/// Exclude dependencies from default groups.
///
/// `--group` can be used to include specific groups.
#[arg(long, conflicts_with_all = ["no_group", "only_group"])]
#[arg(long, conflicts_with_all = ["only_group"])]
pub no_default_groups: bool,

/// Only include dependencies from the specified dependency group.
Expand All @@ -3458,7 +3458,7 @@ pub struct TreeArgs {
/// Include dependencies from all dependency groups.
///
/// `--no-group` can be used to exclude specific groups.
#[arg(long, conflicts_with_all = [ "group", "only_group" ])]
#[arg(long, conflicts_with_all = ["group", "only_group"])]
pub all_groups: bool,

/// Assert that the `uv.lock` will remain unchanged.
Expand Down Expand Up @@ -3614,7 +3614,7 @@ pub struct ExportArgs {
/// Exclude dependencies from default groups.
///
/// `--group` can be used to include specific groups.
#[arg(long, conflicts_with_all = ["no_group", "only_group"])]
#[arg(long, conflicts_with_all = ["only_group"])]
pub no_default_groups: bool,

/// Only include dependencies from the specified dependency group.
Expand All @@ -3628,7 +3628,7 @@ pub struct ExportArgs {
/// Include dependencies from all dependency groups.
///
/// `--no-group` can be used to exclude specific groups.
#[arg(long, conflicts_with_all = [ "group", "only_group" ])]
#[arg(long, conflicts_with_all = ["group", "only_group"])]
pub all_groups: bool,

/// Exclude the comment header at the top of the generated output file.
Expand Down
140 changes: 70 additions & 70 deletions crates/uv-configuration/src/dev.rs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
use std::borrow::Cow;

use either::Either;

use uv_normalize::{GroupName, DEV_DEPENDENCIES};

#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
Expand Down Expand Up @@ -34,14 +32,6 @@ impl DevMode {
Self::Only => "--only-dev",
}
}

/// Returns `true` if the group is `dev`, and development dependencies should be included.
pub fn contains(&self, group: &GroupName) -> bool {
match self {
DevMode::Exclude => false,
DevMode::Include | DevMode::Only => group == &*DEV_DEPENDENCIES,
}
}
}

#[derive(Default, Debug, Clone)]
Expand All @@ -53,7 +43,7 @@ pub struct DevGroupsSpecification {

/// The groups to include.
///
/// Requested via the `--group` and `--only-group` options.
/// Requested via the `--group`, `--no-group`, `--all-groups`, `--only-group` and `--no-default-groups` options.
groups: Option<GroupsSpecification>,
}

Expand All @@ -67,11 +57,8 @@ pub enum GroupsSpecification {
Include {
include: IncludeGroups,
exclude: Vec<GroupName>,
no_default_groups: bool,
},
/// Include dependencies from the specified groups, omitting any default groups.
///
/// If the list is empty, no group will be included.
Explicit { include: Vec<GroupName> },
/// Only include dependencies from the specified groups, exclude all other dependencies.
///
/// The `include` list is guaranteed to omit groups in the `exclude` list (i.e., they have an
Expand All @@ -88,12 +75,13 @@ impl GroupsSpecification {
Self::Include {
include: IncludeGroups::Some(vec![group]),
exclude: Vec::new(),
no_default_groups: false,
}
}

/// Returns `true` if the specification allows for production dependencies.
pub fn prod(&self) -> bool {
matches!(self, Self::Include { .. } | Self::Explicit { .. })
matches!(self, Self::Include { .. })
}

/// Returns `true` if the specification is limited to a select set of groups.
Expand All @@ -104,18 +92,30 @@ impl GroupsSpecification {
/// Returns the option that was used to request the groups, if any.
pub fn as_flag(&self) -> Option<Cow<'_, str>> {
match self {
Self::Include { include, exclude } => match include {
IncludeGroups::All => Some(Cow::Borrowed("--all-groups")),
IncludeGroups::Some(groups) => match groups.as_slice() {
[] => match exclude.as_slice() {
[] => None,
[group] => Some(Cow::Owned(format!("--no-group {group}"))),
[..] => Some(Cow::Borrowed("--no-group")),
Self::Include {
include,
exclude,
no_default_groups,
} => {
let flag = match include {
IncludeGroups::All => Some(Cow::Borrowed("--all-groups")),
IncludeGroups::Some(groups) => match groups.as_slice() {
[] => match exclude.as_slice() {
[] => None,
[group] => Some(Cow::Owned(format!("--no-group {group}"))),
[..] => Some(Cow::Borrowed("--no-group")),
},
[group] => Some(Cow::Owned(format!("--group {group}"))),
[..] => Some(Cow::Borrowed("--group")),
},
[group] => Some(Cow::Owned(format!("--group {group}"))),
[..] => Some(Cow::Borrowed("--group")),
},
},
};
match (flag, *no_default_groups) {
(None, false) => None,
(Some(flag), true) => Some(Cow::Owned(format!("{flag} --no-default-groups"))),
(Some(flag), false) => Some(flag),
(None, true) => Some(Cow::Borrowed("--no-default-groups")),
}
}
Self::Only { include, exclude } => match include.as_slice() {
[] => match exclude.as_slice() {
[] => None,
Expand All @@ -125,36 +125,34 @@ impl GroupsSpecification {
[group] => Some(Cow::Owned(format!("--only-group {group}"))),
[..] => Some(Cow::Borrowed("--only-group")),
},
Self::Explicit { include } => match include.as_slice() {
[] => Some(Cow::Borrowed("--no-default-groups")),
[group] => Some(Cow::Owned(format!("--group {group}"))),
[..] => Some(Cow::Borrowed("--group")),
},
}
}

/// Iterate over all groups referenced in the [`GroupsSpecification`].
pub fn names(&self) -> impl Iterator<Item = &GroupName> {
match self {
GroupsSpecification::Include { include, exclude } => {
Either::Left(include.names().chain(exclude.iter()))
}
GroupsSpecification::Only { include, exclude } => {
Either::Left(include.iter().chain(exclude.iter()))
}
GroupsSpecification::Explicit { include } => Either::Right(include.iter()),
GroupsSpecification::Include {
include, exclude, ..
} => include.names().chain(exclude.iter()),
GroupsSpecification::Only { include, exclude } => include.iter().chain(exclude.iter()),
}
}

/// Returns `true` if the specification includes the given group.
pub fn contains(&self, group: &GroupName) -> bool {
pub fn contains(&self, group: &GroupName, is_default_group: bool) -> bool {
match self {
GroupsSpecification::Include { include, exclude } => {
GroupsSpecification::Include {
include,
exclude,
no_default_groups,
} => {
if *no_default_groups && is_default_group {
return false;
}
// For `--all-groups`, the group is included unless it is explicitly excluded.
include.contains(group) && !exclude.contains(group)
}
GroupsSpecification::Only { include, .. } => include.contains(group),
GroupsSpecification::Explicit { include } => include.contains(group),
}
}

Expand All @@ -163,11 +161,12 @@ impl GroupsSpecification {
let GroupsSpecification::Include {
include: IncludeGroups::Some(includes),
exclude,
no_default_groups,
} = self
else {
return false;
};
includes.is_empty() && exclude.is_empty()
!no_default_groups && includes.is_empty() && exclude.is_empty()
}
}

Expand Down Expand Up @@ -220,15 +219,11 @@ impl DevGroupsSpecification {
None
};

let groups = if no_default_groups {
// Remove groups specified with `--no-group`.
group.retain(|group| !no_group.contains(group));

Some(GroupsSpecification::Explicit { include: group })
} else if all_groups {
let groups = if all_groups {
Some(GroupsSpecification::Include {
include: IncludeGroups::All,
exclude: no_group,
no_default_groups,
})
} else if !group.is_empty() {
if matches!(dev, Some(DevMode::Only)) {
Expand All @@ -241,6 +236,7 @@ impl DevGroupsSpecification {
Some(GroupsSpecification::Include {
include: IncludeGroups::Some(group),
exclude: no_group,
no_default_groups,
})
} else if !only_group.is_empty() {
if matches!(dev, Some(DevMode::Include)) {
Expand All @@ -258,6 +254,13 @@ impl DevGroupsSpecification {
Some(GroupsSpecification::Include {
include: IncludeGroups::Some(Vec::new()),
exclude: no_group,
no_default_groups,
})
} else if no_default_groups {
Some(GroupsSpecification::Include {
include: IncludeGroups::Some(Vec::new()),
exclude: Vec::new(),
no_default_groups,
})
} else {
None
Expand Down Expand Up @@ -300,7 +303,7 @@ impl DevGroupsSpecification {
}

/// Returns `true` if the group is included in the specification.
pub fn contains(&self, group: &GroupName) -> bool {
pub fn contains(&self, group: &GroupName, is_default_group: bool) -> bool {
if group == &*DEV_DEPENDENCIES {
match self.dev.as_ref() {
None => {}
Expand All @@ -315,7 +318,14 @@ impl DevGroupsSpecification {
Some(DevMode::Include) => {
// If `--no-group dev` was provided, exclude dev.
return match self.groups.as_ref() {
Some(GroupsSpecification::Include { exclude, .. }) => {
Some(GroupsSpecification::Include {
exclude,
no_default_groups,
..
}) => {
if *no_default_groups && is_default_group {
return false;
}
!exclude.contains(group)
}
_ => true,
Expand All @@ -326,7 +336,7 @@ impl DevGroupsSpecification {

self.groups
.as_ref()
.is_some_and(|groups| groups.contains(group))
.is_some_and(|groups| groups.contains(group, is_default_group))
}

/// Returns `true` if the specification will have no effect.
Expand Down Expand Up @@ -393,7 +403,7 @@ impl DevGroupsManifest {

/// Returns `true` if the group was enabled by default.
pub fn is_default(&self, group: &GroupName) -> bool {
if self.spec.contains(group) {
if self.spec.contains(group, false) {
// If the group was explicitly requested, then it wasn't enabled by default.
false
} else {
Expand All @@ -405,7 +415,7 @@ impl DevGroupsManifest {

/// Returns `true` if the group is included in the manifest.
pub fn contains(&self, group: &GroupName) -> bool {
if self.spec.contains(group) {
if self.spec.contains(group, self.defaults.contains(group)) {
return true;
}
if self.spec.only() {
Expand All @@ -415,24 +425,14 @@ impl DevGroupsManifest {
.iter()
.filter(|default| {
// If `--no-dev` was provided, exclude the `dev` group from the list of defaults.
if matches!(self.spec.dev_mode(), Some(DevMode::Exclude)) {
if *default == &*DEV_DEPENDENCIES {
return false;
};
}

// If `--no-default-groups` was provided, only include group if it's explicitly
// included with `--group <group>`.
if let Some(GroupsSpecification::Explicit { include }) = self.spec.groups() {
return include.contains(group);
if *default == &*DEV_DEPENDENCIES
&& matches!(self.spec.dev_mode(), Some(DevMode::Exclude))
{
return false;
}

// If `--no-group` was provided, exclude the group from the list of defaults.
if let Some(GroupsSpecification::Include {
include: _,
exclude,
}) = self.spec.groups()
{
if let Some(GroupsSpecification::Include { exclude, .. }) = self.spec.groups() {
// If `--no-group` was provided, exclude the group from the list of defaults.
if exclude.contains(default) {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion crates/uv-requirements/src/source_tree.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl<'a, Context: BuildContext> SourceTreeResolver<'a, Context> {

// Apply dependency-groups
for (group_name, group) in &metadata.dependency_groups {
if self.groups.contains(group_name) {
if self.groups.contains(group_name, false) {
requirements.extend(group.iter().cloned());
}
}
Expand Down

0 comments on commit 350df16

Please sign in to comment.