Prefer locked versions of packages in build environments

Author: zanieb

crates/uv-bench/benches/uv.rs

@@ -99,8 +99,8 @@ mod resolver {
     use uv_pypi_types::{Conflicts, ResolverMarkerEnvironment};
     use uv_python::Interpreter;
     use uv_resolver::{
-        FlatIndex, InMemoryIndex, Manifest, OptionsBuilder, PythonRequirement, Resolver,
-        ResolverEnvironment, ResolverOutput,
+        FlatIndex, InMemoryIndex, Manifest, OptionsBuilder, Preferences, PythonRequirement,
+        Resolver, ResolverEnvironment, ResolverOutput,
     };
     use uv_types::{BuildIsolation, EmptyInstalledPackages, HashStrategy};
     use uv_workspace::WorkspaceCache;
@@ -195,6 +195,7 @@ mod resolver {
             workspace_cache,
             concurrency,
             Preview::default(),
+            Preferences::default(),
         );
 
         let markers = if universal {

crates/uv-dispatch/src/lib.rs

@@ -32,7 +32,7 @@ use uv_installer::{Installer, Plan, Planner, Preparer, SitePackages};
 use uv_pypi_types::Conflicts;
 use uv_python::{Interpreter, PythonEnvironment};
 use uv_resolver::{
-    ExcludeNewer, FlatIndex, Flexibility, InMemoryIndex, Manifest, OptionsBuilder,
+    ExcludeNewer, FlatIndex, Flexibility, InMemoryIndex, Manifest, OptionsBuilder, Preferences,
     PythonRequirement, Resolver, ResolverEnvironment,
 };
 use uv_types::{
@@ -100,6 +100,7 @@ pub struct BuildDispatch<'a> {
     workspace_cache: WorkspaceCache,
     concurrency: Concurrency,
     preview: Preview,
+    preferences: Preferences,
 }
 
 impl<'a> BuildDispatch<'a> {
@@ -124,6 +125,7 @@ impl<'a> BuildDispatch<'a> {
         workspace_cache: WorkspaceCache,
         concurrency: Concurrency,
         preview: Preview,
+        preferences: Preferences,
     ) -> Self {
         Self {
             client,
@@ -148,6 +150,7 @@ impl<'a> BuildDispatch<'a> {
             workspace_cache,
             concurrency,
             preview,
+            preferences,
         }
     }
 
@@ -229,7 +232,9 @@ impl BuildContext for BuildDispatch<'_> {
         let tags = self.interpreter.tags()?;
 
         let resolver = Resolver::new(
-            Manifest::simple(requirements.to_vec()).with_constraints(self.constraints.clone()),
+            Manifest::simple(requirements.to_vec())
+                .with_constraints(self.constraints.clone())
+                .with_preferences(self.preferences.clone()),
             OptionsBuilder::new()
                 .exclude_newer(self.exclude_newer)
                 .index_strategy(self.index_strategy)

crates/uv-resolver/src/manifest.rs

@@ -92,6 +92,12 @@ impl Manifest {
         self
     }
 
+    #[must_use]
+    pub fn with_preferences(mut self, preferences: Preferences) -> Self {
+        self.preferences = preferences;
+        self
+    }
+
     /// Return an iterator over all requirements, constraints, and overrides, in priority order,
     /// such that requirements come first, followed by constraints, followed by overrides.
     ///

crates/uv/src/commands/build_frontend.rs

@@ -35,7 +35,7 @@ use uv_python::{
     VersionRequest,
 };
 use uv_requirements::RequirementsSource;
-use uv_resolver::{ExcludeNewer, FlatIndex};
+use uv_resolver::{ExcludeNewer, FlatIndex, Preferences};
 use uv_settings::PythonInstallMirrors;
 use uv_types::{AnyErrorBuild, BuildContext, BuildIsolation, BuildStack, HashStrategy};
 use uv_workspace::{DiscoveryOptions, Workspace, WorkspaceCache, WorkspaceError};
@@ -581,6 +581,7 @@ async fn build_package(
         workspace_cache,
         concurrency,
         preview,
+        Preferences::default(),
     );
 
     prepare_output_directory(&output_dir).await?;

crates/uv/src/commands/pip/compile.rs

@@ -39,8 +39,8 @@ use uv_requirements::{
 };
 use uv_resolver::{
     AnnotationStyle, DependencyMode, DisplayResolutionGraph, ExcludeNewer, FlatIndex, ForkStrategy,
-    InMemoryIndex, OptionsBuilder, PrereleaseMode, PylockToml, PythonRequirement, ResolutionMode,
-    ResolverEnvironment,
+    InMemoryIndex, OptionsBuilder, Preferences, PrereleaseMode, PylockToml, PythonRequirement,
+    ResolutionMode, ResolverEnvironment,
 };
 use uv_torch::{TorchMode, TorchStrategy};
 use uv_types::{BuildIsolation, EmptyInstalledPackages, HashStrategy};
@@ -490,6 +490,7 @@ pub(crate) async fn pip_compile(
         WorkspaceCache::default(),
         concurrency,
         preview,
+        Preferences::default(),
     );
 
     let options = OptionsBuilder::new()

crates/uv/src/commands/pip/install.rs

@@ -31,8 +31,8 @@ use uv_python::{
 };
 use uv_requirements::{GroupsSpecification, RequirementsSource, RequirementsSpecification};
 use uv_resolver::{
-    DependencyMode, ExcludeNewer, FlatIndex, OptionsBuilder, PrereleaseMode, PylockToml,
-    PythonRequirement, ResolutionMode, ResolverEnvironment,
+    DependencyMode, ExcludeNewer, FlatIndex, OptionsBuilder, Preferences, PrereleaseMode,
+    PylockToml, PythonRequirement, ResolutionMode, ResolverEnvironment,
 };
 use uv_torch::{TorchMode, TorchStrategy};
 use uv_types::{BuildIsolation, HashStrategy};
@@ -434,6 +434,7 @@ pub(crate) async fn pip_install(
         WorkspaceCache::default(),
         concurrency,
         preview,
+        Preferences::default(),
     );
 
     let (resolution, hasher) = if let Some(pylock) = pylock {

crates/uv/src/commands/pip/sync.rs

@@ -27,8 +27,8 @@ use uv_python::{
 };
 use uv_requirements::{GroupsSpecification, RequirementsSource, RequirementsSpecification};
 use uv_resolver::{
-    DependencyMode, ExcludeNewer, FlatIndex, OptionsBuilder, PrereleaseMode, PylockToml,
-    PythonRequirement, ResolutionMode, ResolverEnvironment,
+    DependencyMode, ExcludeNewer, FlatIndex, OptionsBuilder, Preferences, PrereleaseMode,
+    PylockToml, PythonRequirement, ResolutionMode, ResolverEnvironment,
 };
 use uv_torch::{TorchMode, TorchStrategy};
 use uv_types::{BuildIsolation, HashStrategy};
@@ -369,6 +369,7 @@ pub(crate) async fn pip_sync(
         WorkspaceCache::default(),
         concurrency,
         preview,
+        Preferences::default(),
     );
 
     // Determine the set of installed packages.

crates/uv/src/commands/project/add.rs

@@ -36,7 +36,7 @@ use uv_pypi_types::{ParsedUrl, VerbatimParsedUrl};
 use uv_python::{Interpreter, PythonDownloads, PythonEnvironment, PythonPreference, PythonRequest};
 use uv_redacted::DisplaySafeUrl;
 use uv_requirements::{NamedRequirementsResolver, RequirementsSource, RequirementsSpecification};
-use uv_resolver::FlatIndex;
+use uv_resolver::{FlatIndex, Preferences};
 use uv_scripts::{Pep723ItemRef, Pep723Metadata, Pep723Script};
 use uv_settings::PythonInstallMirrors;
 use uv_types::{BuildIsolation, HashStrategy};
@@ -450,6 +450,7 @@ pub(crate) async fn add(
                 WorkspaceCache::default(),
                 concurrency,
                 preview,
+                Preferences::default(),
             );
 
             requirements.extend(

crates/uv/src/commands/project/lock.rs

@@ -29,7 +29,7 @@ use uv_python::{Interpreter, PythonDownloads, PythonEnvironment, PythonPreferenc
 use uv_requirements::ExtrasResolver;
 use uv_requirements::upgrade::{LockedRequirements, read_lock_requirements};
 use uv_resolver::{
-    FlatIndex, InMemoryIndex, Lock, Options, OptionsBuilder, PythonRequirement,
+    FlatIndex, InMemoryIndex, Lock, Options, OptionsBuilder, Preferences, PythonRequirement,
     ResolverEnvironment, ResolverManifest, SatisfiesResult, UniversalMarker,
 };
 use uv_scripts::{Pep723ItemRef, Pep723Script};
@@ -663,6 +663,19 @@ async fn do_lock(
         FlatIndex::from_entries(entries, None, &hasher, build_options)
     };
 
+    // Extract preferences and git refs from the existing lockfile if available for build dispatch.
+    let preferences_for_build = if let Some(existing_lock) = &existing_lock {
+        let locked = read_lock_requirements(existing_lock, target.install_path(), upgrade)?;
+        // Populate the Git resolver.
+        for ResolvedRepositoryReference { reference, sha } in &locked.git {
+            debug!("Inserting Git reference into resolver: `{reference:?}` at `{sha}`");
+            state.git().insert(reference.clone(), *sha);
+        }
+        Preferences::from_iter(locked.preferences, &ResolverEnvironment::universal(vec![]))
+    } else {
+        Preferences::default()
+    };
+
     // Create a build dispatch.
     let build_dispatch = BuildDispatch::new(
         &client,
@@ -685,6 +698,7 @@ async fn do_lock(
         workspace_cache.clone(),
         concurrency,
         preview,
+        preferences_for_build,
     );
 
     let database = DistributionDatabase::new(&client, &build_dispatch, concurrency.downloads);

crates/uv/src/commands/project/mod.rs

@@ -36,8 +36,8 @@ use uv_python::{
 use uv_requirements::upgrade::{LockedRequirements, read_lock_requirements};
 use uv_requirements::{NamedRequirementsResolver, RequirementsSpecification};
 use uv_resolver::{
-    FlatIndex, Lock, OptionsBuilder, Preference, PythonRequirement, ResolverEnvironment,
-    ResolverOutput,
+    FlatIndex, Lock, OptionsBuilder, Preference, Preferences, PythonRequirement,
+    ResolverEnvironment, ResolverOutput,
 };
 use uv_scripts::Pep723ItemRef;
 use uv_settings::PythonInstallMirrors;
@@ -1761,6 +1761,7 @@ pub(crate) async fn resolve_names(
         workspace_cache.clone(),
         concurrency,
         preview,
+        Preferences::default(),
     );
 
     // Resolve the unnamed requirements.
@@ -1969,6 +1970,7 @@ pub(crate) async fn resolve_environment(
         workspace_cache,
         concurrency,
         preview,
+        Preferences::default(),
     );
 
     // Resolve the requirements.
@@ -2107,6 +2109,7 @@ pub(crate) async fn sync_environment(
         workspace_cache,
         concurrency,
         preview,
+        Preferences::default(),
     );
 
     // Sync the environment.
@@ -2331,6 +2334,7 @@ pub(crate) async fn update_environment(
         workspace_cache,
         concurrency,
         preview,
+        Preferences::default(),
     );
 
     // Resolve the requirements.