Skip to content

Add support for relative durations in exclude-newer #16814

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+1,874 −201
Draft

Add support for relative durations in exclude-newer #16814

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
133 changes: 99 additions & 34 deletions crates/uv-cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use uv_pypi_types::VerbatimParsedUrl;
use uv_python::{PythonDownloads, PythonPreference, PythonVersion};
use uv_redacted::DisplaySafeUrl;
use uv_resolver::{
AnnotationStyle, ExcludeNewerPackageEntry, ExcludeNewerTimestamp, ForkStrategy, PrereleaseMode,
AnnotationStyle, ExcludeNewerPackageEntry, ExcludeNewerValue, ForkStrategy, PrereleaseMode,
ResolutionMode,
};
use uv_settings::PythonInstallMirrors;
Expand Down Expand Up @@ -3041,15 +3041,27 @@ pub struct VenvArgs {

/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// Accepts both RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`) and local dates in the same
/// format (e.g., `2006-12-02`) in your system's configured time zone.
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) which use your system's configured time zone, and relative durations
/// (e.g., `24 hours`, `1 week`, `30 days`).
///
/// Relative 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 (i.e., DST transitions are
/// ignored). Calendar units such as months and years are not allowed.
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER)]
pub exclude_newer: Option<ExcludeNewerTimestamp>,
pub exclude_newer: Option<ExcludeNewerValue>,

/// Limit candidate packages for a specific package to those that were uploaded prior to the given date.
/// 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`) which use your system's configured time zone, or relative duration (e.g., `24
/// hours`, `1 week`, `30 days`).
///
/// Accepts package-date pairs in the format `PACKAGE=DATE`, where `DATE` is an RFC 3339 timestamp
/// (e.g., `2006-12-02T02:07:43Z`) or local date (e.g., `2006-12-02`) in your system's configured time zone.
/// Relative 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 (i.e., DST transitions are
/// ignored). Calendar units such as months and years are not allowed.
///
/// Can be provided multiple times for different packages.
#[arg(long)]
Expand Down Expand Up @@ -5517,15 +5529,27 @@ pub struct ToolUpgradeArgs {

/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// Accepts both RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`) and local dates in the same
/// format (e.g., `2006-12-02`) in your system's configured time zone.
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) which use your system's configured time zone, and relative durations
/// (e.g., `24 hours`, `1 week`, `30 days`).
///
/// Relative 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 (i.e., DST transitions are
/// ignored). Calendar units such as months and years are not allowed.
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
pub exclude_newer: Option<ExcludeNewerTimestamp>,
pub exclude_newer: Option<ExcludeNewerValue>,

/// Limit candidate packages for specific packages to those that were uploaded prior to the given date.
/// 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`) or local date (e.g., `2006-12-02`) in your system's configured time zone.
/// 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`) which use your system's configured time zone, or relative duration (e.g., `24
/// hours`, `1 week`, `30 days`).
///
/// Relative 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 (i.e., 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")]
Expand Down Expand Up @@ -6451,15 +6475,27 @@ pub struct InstallerArgs {

/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// Accepts both RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`) and local dates in the same
/// format (e.g., `2006-12-02`) in your system's configured time zone.
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) which use your system's configured time zone, and relative durations
/// (e.g., `24 hours`, `1 week`, `30 days`).
///
/// Relative 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 (i.e., DST transitions are
/// ignored). Calendar units such as months and years are not allowed.
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
pub exclude_newer: Option<ExcludeNewerTimestamp>,
pub exclude_newer: Option<ExcludeNewerValue>,

/// Limit candidate packages for specific packages to those that were uploaded prior to the given date.
/// 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`) which use your system's configured time zone, or relative duration (e.g., `24
/// hours`, `1 week`, `30 days`).
///
/// Accepts package-date pairs in the format `PACKAGE=DATE`, where `DATE` is an RFC 3339 timestamp
/// (e.g., `2006-12-02T02:07:43Z`) or local date (e.g., `2006-12-02`) in your system's configured time zone.
/// Relative 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 (i.e., 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")]
Expand Down Expand Up @@ -6671,15 +6707,27 @@ pub struct ResolverArgs {

/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// Accepts both RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`) and local dates in the same
/// format (e.g., `2006-12-02`) in your system's configured time zone.
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) which use your system's configured time zone, and relative durations
/// (e.g., `24 hours`, `1 week`, `30 days`).
///
/// Relative 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 (i.e., DST transitions are
/// ignored). Calendar units such as months and years are not allowed.
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
pub exclude_newer: Option<ExcludeNewerTimestamp>,
pub exclude_newer: Option<ExcludeNewerValue>,

/// Limit candidate packages for a specific package to those that were uploaded prior to the given date.
/// 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`) which use your system's configured time zone, or relative duration (e.g., `24
/// hours`, `1 week`, `30 days`).
///
/// Accepts package-date pairs in the format `PACKAGE=DATE`, where `DATE` is an RFC 3339 timestamp
/// (e.g., `2006-12-02T02:07:43Z`) or local date (e.g., `2006-12-02`) in your system's configured time zone.
/// Relative 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 (i.e., 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")]
Expand Down Expand Up @@ -6887,15 +6935,27 @@ pub struct ResolverInstallerArgs {

/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// Accepts both RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`) and local dates in the same
/// format (e.g., `2006-12-02`) in your system's configured time zone.
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) which use your system's configured time zone, and relative durations
/// (e.g., `24 hours`, `1 week`, `30 days`).
///
/// Relative 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 (i.e., DST transitions are
/// ignored). Calendar units such as months and years are not allowed.
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
pub exclude_newer: Option<ExcludeNewerTimestamp>,
pub exclude_newer: Option<ExcludeNewerValue>,

/// Limit candidate packages for specific packages to those that were uploaded prior to the given date.
/// 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`) or local date (e.g., `2006-12-02`) in your system's configured time zone.
/// 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`) which use your system's configured time zone, or relative duration (e.g., `24
/// hours`, `1 week`, `30 days`).
///
/// Relative 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 (i.e., 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")]
Expand Down Expand Up @@ -6995,10 +7055,15 @@ pub struct FetchArgs {

/// Limit candidate packages to those that were uploaded prior to the given date.
///
/// Accepts both RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`) and local dates in the same
/// format (e.g., `2006-12-02`) in your system's configured time zone.
/// Accepts RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`), local dates in the same format
/// (e.g., `2006-12-02`) which use your system's configured time zone, and relative durations
/// (e.g., `24 hours`, `1 week`, `30 days`).
///
/// Relative 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 (i.e., DST transitions are
/// ignored). Calendar units such as months and years are not allowed.
#[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
pub exclude_newer: Option<ExcludeNewerTimestamp>,
pub exclude_newer: Option<ExcludeNewerValue>,
}

#[derive(Args)]
Expand Down
Loading
Loading