Respect build tag priority in uv.lock

Author: charliermarsh

crates/uv-resolver/src/lock/mod.rs

@@ -27,7 +27,9 @@ use crate::{
 use uv_cache_key::RepositoryUrl;
 use uv_configuration::BuildOptions;
 use uv_distribution::DistributionDatabase;
-use uv_distribution_filename::{DistExtension, ExtensionError, SourceDistExtension, WheelFilename};
+use uv_distribution_filename::{
+    BuildTag, DistExtension, ExtensionError, SourceDistExtension, WheelFilename,
+};
 use uv_distribution_types::{
     BuiltDist, DependencyMetadata, DirectUrlBuiltDist, DirectUrlSourceDist, DirectorySourceDist,
     Dist, DistributionMetadata, FileLocation, GitSourceDist, IndexLocations, IndexUrl, Name,
@@ -1679,6 +1681,10 @@ impl Package {
                             best_wheel_index,
                             sdist: None,
                         };
+                        println!(
+                            "reg_built_dist: {:?}",
+                            reg_built_dist.wheels[reg_built_dist.best_wheel_index]
+                        );
                         Ok(Dist::Built(BuiltDist::Registry(reg_built_dist)))
                     }
                     Source::Path(path) => {
@@ -2094,13 +2100,17 @@ impl Package {
     }
 
     fn find_best_wheel(&self, tag_policy: TagPolicy<'_>) -> Option<usize> {
-        let mut best: Option<(TagPriority, usize)> = None;
+        type WheelPriority<'lock> = (TagPriority, Option<&'lock BuildTag>);
+
+        let mut best: Option<(WheelPriority, usize)> = None;
         for (i, wheel) in self.wheels.iter().enumerate() {
-            let TagCompatibility::Compatible(priority) =
+            let TagCompatibility::Compatible(tag_priority) =
                 wheel.filename.compatibility(tag_policy.tags())
             else {
                 continue;
             };
+            let build_tag = wheel.filename.build_tag.as_ref();
+            let priority = (tag_priority, build_tag);
             match best {
                 None => {
                     best = Some((priority, i));

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

@@ -10,7 +10,8 @@ use uv_cache::Cache;
 use uv_client::{Connectivity, FlatIndexClient, RegistryClientBuilder};
 use uv_configuration::{
     Concurrency, Constraints, DevGroupsManifest, DevGroupsSpecification, EditableMode,
-    ExtrasSpecification, HashCheckingMode, InstallOptions, LowerBound, PreviewMode, TrustedHost,
+    ExtrasSpecification, HashCheckingMode, InstallOptions, LowerBound, PreviewMode, TargetTriple,
+    TrustedHost,
 };
 use uv_dispatch::{BuildDispatch, SharedState};
 use uv_distribution_types::{
@@ -31,8 +32,8 @@ use uv_workspace::pyproject::{DependencyGroupSpecifier, Source, Sources, ToolUvS
 use uv_workspace::{DiscoveryOptions, MemberDiscovery, VirtualProject, Workspace};
 
 use crate::commands::pip::loggers::{DefaultInstallLogger, DefaultResolveLogger, InstallLogger};
-use crate::commands::pip::operations;
 use crate::commands::pip::operations::Modifications;
+use crate::commands::pip::{operations, resolution_tags};
 use crate::commands::project::lock::{do_safe_lock, LockMode};
 use crate::commands::project::{
     default_dependency_groups, detect_conflicts, DependencyGroupsTarget, ProjectError,
@@ -341,12 +342,16 @@ pub(super) async fn do_sync(
     }
 
     // Determine the tags to use for resolution.
-    let tags = venv.interpreter().tags()?;
+    let tags = resolution_tags(
+        None,
+        Some(&TargetTriple::X8664Manylinux231),
+        venv.interpreter(),
+    )?;
 
     // Read the lockfile.
     let resolution = target.to_resolution(
         &marker_env,
-        tags,
+        &tags,
         extras,
         dev,
         build_options,
@@ -406,7 +411,7 @@ pub(super) async fn do_sync(
         let entries = client
             .fetch(index_locations.flat_indexes().map(Index::url))
             .await?;
-        FlatIndex::from_entries(entries, Some(tags), &hasher, build_options)
+        FlatIndex::from_entries(entries, Some(&tags), &hasher, build_options)
     };
 
     // Create a build dispatch.
@@ -446,7 +451,7 @@ pub(super) async fn do_sync(
         index_locations,
         config_setting,
         &hasher,
-        tags,
+        &tags,
         &client,
         state.in_flight(),
         concurrency,