Skip to content

Fix discrepancies in argument parsing of exclude-newer #20679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EliteTK merged 1 commit into from
Jul 27, 2026
+123 −236
Merged

Fix discrepancies in argument parsing of exclude-newer #20679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
282 changes: 69 additions & 213 deletions crates/uv-cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3147,41 +3147,8 @@ pub struct VenvArgs {
#[command(flatten)]
pub registry_client: RegistryClientArgs,

/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// The date is compared against the upload time of each individual distribution artifact
/// (i.e., when each file was uploaded to the package index), not the release date of the
/// package version.
///
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) resolved based on your system's configured time zone, a "friendly"
/// duration (e.g., `24 hours`, `1 week`, `30 days`), or an ISO 8601 duration (e.g., `PT24H`,
/// `P7D`, `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Use `false` to disable `exclude-newer`.
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER)]
pub exclude_newer: Option<ExcludeNewerOverride>,

/// Limit candidate packages for a specific package to those that were uploaded prior to the
/// given date.
///
/// Accepts package-date pairs in the format `PACKAGE=DATE`, where `DATE` is an RFC 3339
/// timestamp (e.g., `2006-12-02T02:07:43Z`), a local date in the same format (e.g.,
/// `2006-12-02`) resolved based on your system's configured time zone, a "friendly" duration
/// (e.g., `24 hours`, `1 week`, `30 days`), or a ISO 8601 duration (e.g., `PT24H`, `P7D`,
/// `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Can be provided multiple times for different packages.
#[arg(long)]
pub exclude_newer_package: Option<Vec<ExcludeNewerPackageEntry>>,
#[command(flatten)]
pub exclude_newer: PackageExcludeNewerArgs,

/// The method to use when installing packages from the global cache.
///
Expand Down Expand Up @@ -5096,7 +5063,7 @@ pub struct FormatArgs {
/// durations relative to "now" (e.g., `-1 week`).
///
/// Use `false` to disable `exclude-newer`.
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER)]
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, value_hint = ValueHint::Other)]
pub exclude_newer: Option<ExcludeNewerOverride>,

/// Additional arguments to pass to Ruff.
Expand Down Expand Up @@ -6013,20 +5980,8 @@ pub struct ToolListArgs {
#[arg(long, overrides_with("outdated"), hide = true)]
pub no_outdated: bool,

/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) resolved based on your system's configured time zone, a "friendly"
/// duration (e.g., `24 hours`, `1 week`, `30 days`), or an ISO 8601 duration (e.g., `PT24H`,
/// `P7D`, `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Use `false` to disable `exclude-newer`.
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
pub exclude_newer: Option<ExcludeNewerOverride>,
#[command(flatten)]
pub exclude_newer: PackageExcludeNewerArgs,

// Hide unused global Python options.
#[arg(long, hide = true)]
Expand Down Expand Up @@ -6163,41 +6118,8 @@ pub struct ToolUpgradeArgs {
#[command(flatten)]
pub build_isolation: PackageBuildIsolationArgs,

/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// The date is compared against the upload time of each individual distribution artifact
/// (i.e., when each file was uploaded to the package index), not the release date of the
/// package version.
///
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) resolved based on your system's configured time zone, a "friendly"
/// duration (e.g., `24 hours`, `1 week`, `30 days`), or an ISO 8601 duration (e.g., `PT24H`,
/// `P7D`, `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Use `false` to disable `exclude-newer`.
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
pub exclude_newer: Option<ExcludeNewerOverride>,

/// Limit candidate packages for specific packages to those that were uploaded prior to the
/// given date.
///
/// Accepts package-date pairs in the format `PACKAGE=DATE`, where `DATE` is an RFC 3339
/// timestamp (e.g., `2006-12-02T02:07:43Z`), a local date in the same format (e.g.,
/// `2006-12-02`) resolved based on your system's configured time zone, a "friendly" duration
/// (e.g., `24 hours`, `1 week`, `30 days`), or an ISO 8601 duration (e.g., `PT24H`, `P7D`,
/// `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Can be provided multiple times for different packages.
#[arg(long, help_heading = "Resolver options")]
pub exclude_newer_package: Option<Vec<ExcludeNewerPackageEntry>>,
#[command(flatten)]
pub exclude_newer: PackageExcludeNewerArgs,

/// The method to use when installing packages from the global cache.
///
Expand Down Expand Up @@ -7168,6 +7090,60 @@ pub struct HashCheckingArgs {
pub no_verify_hashes: bool,
}

/// Arguments that filter packages by upload date.
#[derive(Args)]
#[group(skip)]
pub struct ExcludeNewerArgs {
/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// The date is compared against the upload time of each individual distribution artifact
/// (i.e., when each file was uploaded to the package index), not the release date of the
/// package version.
///
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) resolved based on your system's configured time zone, a "friendly"
/// duration (e.g., `24 hours`, `1 week`, `30 days`), or an ISO 8601 duration (e.g., `PT24H`,
/// `P7D`, `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Use `false` to disable `exclude-newer`.
#[arg(
long,
env = EnvVars::UV_EXCLUDE_NEWER,
help_heading = "Resolver options",
value_hint = ValueHint::Other,
)]
pub exclude_newer: Option<ExcludeNewerOverride>,
}

/// Arguments that filter packages by global and package-specific upload dates.
#[derive(Args)]
#[group(skip)]
pub struct PackageExcludeNewerArgs {
#[command(flatten)]
pub exclude_newer: ExcludeNewerArgs,

/// Limit candidate packages for specific packages to those that were uploaded prior to the
/// given date.
///
/// Accepts package-date pairs in the format `PACKAGE=DATE`, where `DATE` is an RFC 3339
/// timestamp (e.g., `2006-12-02T02:07:43Z`), a local date in the same format (e.g.,
/// `2006-12-02`) resolved based on your system's configured time zone, a "friendly" duration
/// (e.g., `24 hours`, `1 week`, `30 days`), or an ISO 8601 duration (e.g., `PT24H`, `P7D`,
/// `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Can be provided multiple times for different packages.
#[arg(long, help_heading = "Resolver options", value_hint = ValueHint::Other)]
pub exclude_newer_package: Option<Vec<ExcludeNewerPackageEntry>>,
}

#[derive(Args)]
pub struct RefreshArgs {
/// Refresh all cached data.
Expand Down Expand Up @@ -7383,41 +7359,8 @@ pub struct InstallerArgs {
#[command(flatten)]
build_isolation: BuildIsolationArgs,

/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// The date is compared against the upload time of each individual distribution artifact
/// (i.e., when each file was uploaded to the package index), not the release date of the
/// package version.
///
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) resolved based on your system's configured time zone, a "friendly"
/// duration (e.g., `24 hours`, `1 week`, `30 days`), or an ISO 8601 duration (e.g., `PT24H`,
/// `P7D`, `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Use `false` to disable `exclude-newer`.
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
exclude_newer: Option<ExcludeNewerOverride>,

/// Limit candidate packages for specific packages to those that were uploaded prior to the
/// given date.
///
/// Accepts package-date pairs in the format `PACKAGE=DATE`, where `DATE` is an RFC 3339
/// timestamp (e.g., `2006-12-02T02:07:43Z`), a local date in the same format (e.g.,
/// `2006-12-02`) resolved based on your system's configured time zone, a "friendly" duration
/// (e.g., `24 hours`, `1 week`, `30 days`), or an ISO 8601 duration (e.g., `PT24H`, `P7D`,
/// `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Can be provided multiple times for different packages.
#[arg(long, help_heading = "Resolver options")]
exclude_newer_package: Option<Vec<ExcludeNewerPackageEntry>>,
#[command(flatten)]
exclude_newer: PackageExcludeNewerArgs,

/// The method to use when installing packages from the global cache.
///
Expand Down Expand Up @@ -7503,41 +7446,8 @@ pub struct ResolverArgs {
#[command(flatten)]
build_isolation: PackageBuildIsolationArgs,

/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// The date is compared against the upload time of each individual distribution artifact
/// (i.e., when each file was uploaded to the package index), not the release date of the
/// package version.
///
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) resolved based on your system's configured time zone, a "friendly"
/// duration (e.g., `24 hours`, `1 week`, `30 days`), or an ISO 8601 duration (e.g., `PT24H`,
/// `P7D`, `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Use `false` to disable `exclude-newer`.
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
exclude_newer: Option<ExcludeNewerOverride>,

/// Limit candidate packages for specific packages to those that were uploaded prior to the
/// given date.
///
/// Accepts package-date pairs in the format `PACKAGE=DATE`, where `DATE` is an RFC 3339
/// timestamp (e.g., `2006-12-02T02:07:43Z`), a local date in the same format (e.g.,
/// `2006-12-02`) resolved based on your system's configured time zone, a "friendly" duration
/// (e.g., `24 hours`, `1 week`, `30 days`), or an ISO 8601 duration (e.g., `PT24H`, `P7D`,
/// `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Can be provided multiple times for different packages.
#[arg(long, help_heading = "Resolver options")]
exclude_newer_package: Option<Vec<ExcludeNewerPackageEntry>>,
#[command(flatten)]
exclude_newer: PackageExcludeNewerArgs,

/// The method to use when installing packages from the global cache.
///
Expand Down Expand Up @@ -7627,46 +7537,8 @@ pub struct ResolverInstallerArgs {
#[command(flatten)]
pub build_isolation: PackageBuildIsolationArgs,

/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// The date is compared against the upload time of each individual distribution artifact
/// (i.e., when each file was uploaded to the package index), not the release date of the
/// package version.
///
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) resolved based on your system's configured time zone, a "friendly"
/// duration (e.g., `24 hours`, `1 week`, `30 days`), or an ISO 8601 duration (e.g., `PT24H`,
/// `P7D`, `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Use `false` to disable `exclude-newer`.
#[arg(
long,
env = EnvVars::UV_EXCLUDE_NEWER,
help_heading = "Resolver options",
value_hint = ValueHint::Other,
)]
pub exclude_newer: Option<ExcludeNewerOverride>,

/// Limit candidate packages for specific packages to those that were uploaded prior to the
/// given date.
///
/// Accepts package-date pairs in the format `PACKAGE=DATE`, where `DATE` is an RFC 3339
/// timestamp (e.g., `2006-12-02T02:07:43Z`), a local date in the same format (e.g.,
/// `2006-12-02`) resolved based on your system's configured time zone, a "friendly" duration
/// (e.g., `24 hours`, `1 week`, `30 days`), or an ISO 8601 duration (e.g., `PT24H`, `P7D`,
/// `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Can be provided multiple times for different packages.
#[arg(long, help_heading = "Resolver options", value_hint = ValueHint::Other)]
pub exclude_newer_package: Option<Vec<ExcludeNewerPackageEntry>>,
#[command(flatten)]
pub exclude_newer: PackageExcludeNewerArgs,

/// The method to use when installing packages from the global cache.
///
Expand Down Expand Up @@ -7701,24 +7573,8 @@ pub struct FetchArgs {
#[command(flatten)]
registry_client: RegistryClientArgs,

/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// The date is compared against the upload time of each individual distribution artifact
/// (i.e., when each file was uploaded to the package index), not the release date of the
/// package version.
///
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) resolved based on your system's configured time zone, a "friendly"
/// duration (e.g., `24 hours`, `1 week`, `30 days`), or an ISO 8601 duration (e.g., `PT24H`,
/// `P7D`, `P30D`).
///
/// Durations do not respect semantics of the local time zone and are always resolved to a fixed
/// number of seconds assuming that a day is 24 hours (e.g., DST transitions are ignored).
/// Calendar units such as months and years are not allowed.
///
/// Use `false` to disable `exclude-newer`.
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
exclude_newer: Option<ExcludeNewerOverride>,
#[command(flatten)]
exclude_newer: PackageExcludeNewerArgs,
}

#[derive(Args)]
Expand Down
Loading