Add exclude-newer-package

Author: zanieb

Cargo.lock

@@ -158,7 +158,9 @@ mod resolver {
         let index = InMemoryIndex::default();
         let index_locations = IndexLocations::default();
         let installed_packages = EmptyInstalledPackages;
-        let options = OptionsBuilder::new().exclude_newer(exclude_newer).build();
+        let options = OptionsBuilder::new()
+            .exclude_newer(exclude_newer.clone())
+            .build();
         let sources = SourceStrategy::default();
         let dependency_metadata = DependencyMetadata::default();
         let conflicts = Conflicts::empty();

crates/uv-bench/benches/uv.rs

@@ -19,7 +19,10 @@ use uv_pep508::{MarkerTree, Requirement};
 use uv_pypi_types::VerbatimParsedUrl;
 use uv_python::{PythonDownloads, PythonPreference, PythonVersion};
 use uv_redacted::DisplaySafeUrl;
-use uv_resolver::{AnnotationStyle, ExcludeNewer, ForkStrategy, PrereleaseMode, ResolutionMode};
+use uv_resolver::{
+    AnnotationStyle, ExcludeNewer, ExcludeNewerTimestamp, ForkStrategy, PrereleaseMode,
+    ResolutionMode,
+};
 use uv_static::EnvVars;
 use uv_torch::TorchMode;
 use uv_workspace::pyproject_mut::AddBoundsKind;
@@ -29,6 +32,31 @@ pub mod compat;
 pub mod options;
 pub mod version;
 
+/// A package-specific exclude-newer entry in the format `PACKAGE=DATE`.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ExcludeNewerPackageEntry {
+    pub package: PackageName,
+    pub timestamp: ExcludeNewerTimestamp,
+}
+
+impl FromStr for ExcludeNewerPackageEntry {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let Some((package, date)) = s.split_once('=') else {
+            return Err(format!(
+                "Invalid exclude-newer-package: {s} (expected `PACKAGE=DATE`)"
+            ));
+        };
+
+        let package = PackageName::from_str(package)
+            .map_err(|err| format!("Invalid package name `{package}`: {err}"))?;
+        let timestamp = ExcludeNewerTimestamp::from_str(date)?;
+
+        Ok(Self { package, timestamp })
+    }
+}
+
 #[derive(Debug, Clone, Copy, clap::ValueEnum)]
 pub enum VersionFormat {
     /// Display the version as plain text.
@@ -2646,6 +2674,15 @@ pub struct VenvArgs {
     #[arg(long, env = EnvVars::UV_EXCLUDE_NEWER)]
     pub exclude_newer: Option<ExcludeNewer>,
 
+    /// 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`) or local date (e.g., `2006-12-02`) in your system's configured time zone.
+    ///
+    /// Can be provided multiple times for different packages.
+    #[arg(long)]
+    pub exclude_newer_package: Option<Vec<ExcludeNewerPackageEntry>>,
+
     /// The method to use when installing packages from the global cache.
     ///
     /// This option is only used for installing seed packages.
@@ -4628,6 +4665,15 @@ pub struct ToolUpgradeArgs {
     #[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
     pub exclude_newer: Option<ExcludeNewer>,
 
+    /// 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.
+    ///
+    /// Can be provided multiple times for different packages.
+    #[arg(long, help_heading = "Resolver options")]
+    pub exclude_newer_package: Option<Vec<ExcludeNewerPackageEntry>>,
+
     /// The method to use when installing packages from the global cache.
     ///
     /// Defaults to `clone` (also known as Copy-on-Write) on macOS, and `hardlink` on Linux and
@@ -5369,6 +5415,15 @@ pub struct InstallerArgs {
     #[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
     pub exclude_newer: Option<ExcludeNewer>,
 
+    /// 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.
+    ///
+    /// Can be provided multiple times for different packages.
+    #[arg(long, help_heading = "Resolver options")]
+    pub exclude_newer_package: Option<Vec<ExcludeNewerPackageEntry>>,
+
     /// The method to use when installing packages from the global cache.
     ///
     /// Defaults to `clone` (also known as Copy-on-Write) on macOS, and `hardlink` on Linux and
@@ -5562,6 +5617,15 @@ pub struct ResolverArgs {
     #[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
     pub exclude_newer: Option<ExcludeNewer>,
 
+    /// 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`) or local date (e.g., `2006-12-02`) in your system's configured time zone.
+    ///
+    /// Can be provided multiple times for different packages.
+    #[arg(long, help_heading = "Resolver options")]
+    pub exclude_newer_package: Option<Vec<ExcludeNewerPackageEntry>>,
+
     /// The method to use when installing packages from the global cache.
     ///
     /// This option is only used when building source distributions.
@@ -5751,6 +5815,15 @@ pub struct ResolverInstallerArgs {
     #[arg(long, env = EnvVars::UV_EXCLUDE_NEWER, help_heading = "Resolver options")]
     pub exclude_newer: Option<ExcludeNewer>,
 
+    /// 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.
+    ///
+    /// Can be provided multiple times for different packages.
+    #[arg(long, help_heading = "Resolver options")]
+    pub exclude_newer_package: Option<Vec<ExcludeNewerPackageEntry>>,
+
     /// The method to use when installing packages from the global cache.
     ///
     /// Defaults to `clone` (also known as Copy-on-Write) on macOS, and `hardlink` on Linux and

crates/uv-cli/src/lib.rs

@@ -2,15 +2,36 @@ use anstream::eprintln;
 
 use uv_cache::Refresh;
 use uv_configuration::ConfigSettings;
-use uv_resolver::PrereleaseMode;
+use uv_resolver::{ExcludeNewer, PrereleaseMode};
 use uv_settings::{Combine, PipOptions, ResolverInstallerOptions, ResolverOptions};
 use uv_warnings::owo_colors::OwoColorize;
 
 use crate::{
-    BuildOptionsArgs, FetchArgs, IndexArgs, InstallerArgs, Maybe, RefreshArgs, ResolverArgs,
-    ResolverInstallerArgs,
+    BuildOptionsArgs, ExcludeNewerPackageEntry, FetchArgs, IndexArgs, InstallerArgs, Maybe,
+    RefreshArgs, ResolverArgs, ResolverInstallerArgs,
 };
 
+/// Merge an existing `ExcludeNewer` configuration with package-specific entries.
+fn merge_exclude_newer(
+    base: Option<ExcludeNewer>,
+    package_entries: Option<Vec<ExcludeNewerPackageEntry>>,
+) -> Option<ExcludeNewer> {
+    let package_entries = package_entries.unwrap_or_default();
+
+    if base.is_none() && package_entries.is_empty() {
+        return None;
+    }
+
+    let mut result = base.unwrap_or_default();
+
+    // Add package-specific entries
+    for entry in package_entries {
+        result.package.insert(entry.package, entry.timestamp);
+    }
+
+    Some(result)
+}
+
 /// Given a boolean flag pair (like `--upgrade` and `--no-upgrade`), resolve the value of the flag.
 pub fn flag(yes: bool, no: bool, name: &str) -> Option<bool> {
     match (yes, no) {
@@ -68,6 +89,7 @@ impl From<ResolverArgs> for PipOptions {
             exclude_newer,
             link_mode,
             no_sources,
+            exclude_newer_package,
         } = args;
 
         Self {
@@ -86,7 +108,7 @@ impl From<ResolverArgs> for PipOptions {
                 .map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
             no_build_isolation: flag(no_build_isolation, build_isolation, "build-isolation"),
             no_build_isolation_package: Some(no_build_isolation_package),
-            exclude_newer,
+            exclude_newer: merge_exclude_newer(exclude_newer, exclude_newer_package),
             link_mode,
             no_sources: if no_sources { Some(true) } else { None },
             ..PipOptions::from(index_args)
@@ -111,6 +133,7 @@ impl From<InstallerArgs> for PipOptions {
             compile_bytecode,
             no_compile_bytecode,
             no_sources,
+            exclude_newer_package: _,
         } = args;
 
         Self {
@@ -155,6 +178,7 @@ impl From<ResolverInstallerArgs> for PipOptions {
             compile_bytecode,
             no_compile_bytecode,
             no_sources,
+            exclude_newer_package,
         } = args;
 
         Self {
@@ -175,7 +199,7 @@ impl From<ResolverInstallerArgs> for PipOptions {
                 .map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
             no_build_isolation: flag(no_build_isolation, build_isolation, "build-isolation"),
             no_build_isolation_package: Some(no_build_isolation_package),
-            exclude_newer,
+            exclude_newer: merge_exclude_newer(exclude_newer, exclude_newer_package),
             link_mode,
             compile_bytecode: flag(compile_bytecode, no_compile_bytecode, "compile-bytecode"),
             no_sources: if no_sources { Some(true) } else { None },
@@ -266,6 +290,7 @@ pub fn resolver_options(
         exclude_newer,
         link_mode,
         no_sources,
+        exclude_newer_package,
     } = resolver_args;
 
     let BuildOptionsArgs {
@@ -323,7 +348,7 @@ pub fn resolver_options(
             .map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
         no_build_isolation: flag(no_build_isolation, build_isolation, "build-isolation"),
         no_build_isolation_package: Some(no_build_isolation_package),
-        exclude_newer,
+        exclude_newer: merge_exclude_newer(exclude_newer, exclude_newer_package),
         link_mode,
         no_build: flag(no_build, build, "build"),
         no_build_package: Some(no_build_package),
@@ -357,6 +382,7 @@ pub fn resolver_installer_options(
         no_build_isolation_package,
         build_isolation,
         exclude_newer,
+        exclude_newer_package,
         link_mode,
         compile_bytecode,
         no_compile_bytecode,
@@ -434,7 +460,8 @@ pub fn resolver_installer_options(
         } else {
             Some(no_build_isolation_package)
         },
-        exclude_newer,
+        exclude_newer: merge_exclude_newer(exclude_newer, exclude_newer_package),
+        exclude_newer_package: None,
         link_mode,
         compile_bytecode: flag(compile_bytecode, no_compile_bytecode, "compile-bytecode"),
         no_build: flag(no_build, build, "build"),

crates/uv-cli/src/options.rs

@@ -224,7 +224,7 @@ impl BuildContext for BuildDispatch<'_> {
         let resolver = Resolver::new(
             Manifest::simple(requirements.to_vec()).with_constraints(self.constraints.clone()),
             OptionsBuilder::new()
-                .exclude_newer(self.exclude_newer)
+                .exclude_newer(self.exclude_newer.clone())
                 .index_strategy(self.index_strategy)
                 .build_options(self.build_options.clone())
                 .flexibility(Flexibility::Fixed)