Add file-to-CLI overrides for build isolation configuration (#15437)

## Summary

Like #15395, but `--no-build-isolation`.

Author: charliermarsh

crates/uv-cli/src/options.rs

@@ -1,7 +1,7 @@
 use anstream::eprintln;
 
 use uv_cache::Refresh;
-use uv_configuration::{Reinstall, Upgrade};
+use uv_configuration::{BuildIsolation, Reinstall, Upgrade};
 use uv_distribution_types::{ConfigSettings, PackageConfigSettings, Requirement};
 use uv_resolver::{ExcludeNewer, ExcludeNewerPackage, PrereleaseMode};
 use uv_settings::{Combine, PipOptions, ResolverInstallerOptions, ResolverOptions};
@@ -355,8 +355,10 @@ pub fn resolver_options(
                 .into_iter()
                 .collect::<PackageConfigSettings>()
         }),
-        no_build_isolation: flag(no_build_isolation, build_isolation, "build-isolation"),
-        no_build_isolation_package: Some(no_build_isolation_package),
+        build_isolation: BuildIsolation::from_args(
+            flag(no_build_isolation, build_isolation, "build-isolation"),
+            no_build_isolation_package,
+        ),
         extra_build_dependencies: None,
         extra_build_variables: None,
         exclude_newer: ExcludeNewer::from_args(
@@ -470,12 +472,10 @@ pub fn resolver_installer_options(
                 .into_iter()
                 .collect::<PackageConfigSettings>()
         }),
-        no_build_isolation: flag(no_build_isolation, build_isolation, "build-isolation"),
-        no_build_isolation_package: if no_build_isolation_package.is_empty() {
-            None
-        } else {
-            Some(no_build_isolation_package)
-        },
+        build_isolation: BuildIsolation::from_args(
+            flag(no_build_isolation, build_isolation, "build-isolation"),
+            no_build_isolation_package,
+        ),
         extra_build_dependencies: None,
         extra_build_variables: None,
         exclude_newer,

crates/uv-configuration/src/package_options.rs

@@ -248,3 +248,55 @@ impl From<Upgrade> for Refresh {
         }
     }
 }
+
+/// Whether to isolate builds.
+#[derive(Debug, Default, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "kebab-case", deny_unknown_fields)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub enum BuildIsolation {
+    /// Isolate all builds.
+    #[default]
+    Isolate,
+
+    /// Do not isolate any builds.
+    Shared,
+
+    /// Do not isolate builds for the specified packages.
+    SharedPackage(Vec<PackageName>),
+}
+
+impl BuildIsolation {
+    /// Determine the build isolation strategy from the command-line arguments.
+    pub fn from_args(
+        no_build_isolation: Option<bool>,
+        no_build_isolation_package: Vec<PackageName>,
+    ) -> Option<Self> {
+        match no_build_isolation {
+            Some(true) => Some(Self::Shared),
+            Some(false) => Some(Self::Isolate),
+            None if no_build_isolation_package.is_empty() => None,
+            None => Some(Self::SharedPackage(no_build_isolation_package)),
+        }
+    }
+
+    /// Combine a set of [`BuildIsolation`] values.
+    #[must_use]
+    pub fn combine(self, other: Self) -> Self {
+        match self {
+            // Setting `--build-isolation` or `--no-build-isolation` should clear previous `--no-build-isolation-package` selections.
+            Self::Isolate | Self::Shared => self,
+            Self::SharedPackage(self_packages) => match other {
+                // If `--no-build-isolation` was enabled previously, `--no-build-isolation-package` is subsumed by sharing all builds.
+                Self::Shared => other,
+                // If `--build-isolation` was enabled previously, then `--no-build-isolation-package` enables specific packages to be shared.
+                Self::Isolate => Self::SharedPackage(self_packages),
+                // If `--no-build-isolation-package` was included twice, combine the packages.
+                Self::SharedPackage(other_packages) => {
+                    let mut combined = self_packages;
+                    combined.extend(other_packages);
+                    Self::SharedPackage(combined)
+                }
+            },
+        }
+    }
+}

crates/uv-settings/src/combine.rs

@@ -4,8 +4,8 @@ use std::{collections::BTreeMap, num::NonZeroUsize};
 use url::Url;
 
 use uv_configuration::{
-    ExportFormat, IndexStrategy, KeyringProviderType, Reinstall, RequiredVersion, TargetTriple,
-    TrustedPublishing, Upgrade,
+    BuildIsolation, ExportFormat, IndexStrategy, KeyringProviderType, Reinstall, RequiredVersion,
+    TargetTriple, TrustedPublishing, Upgrade,
 };
 use uv_distribution_types::{
     ConfigSettings, ExtraBuildVariables, Index, IndexUrl, PackageConfigSettings, PipExtraIndex,
@@ -199,6 +199,15 @@ impl Combine for Option<Reinstall> {
     }
 }
 
+impl Combine for Option<BuildIsolation> {
+    fn combine(self, other: Self) -> Self {
+        match (self, other) {
+            (Some(a), Some(b)) => Some(a.combine(b)),
+            (a, b) => a.or(b),
+        }
+    }
+}
+
 impl Combine for serde::de::IgnoredAny {
     fn combine(self, _other: Self) -> Self {
         self

crates/uv-settings/src/settings.rs

@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use uv_cache_info::CacheKey;
 use uv_configuration::{
-    IndexStrategy, KeyringProviderType, PackageNameSpecifier, Reinstall, RequiredVersion,
-    TargetTriple, TrustedHost, TrustedPublishing, Upgrade,
+    BuildIsolation, IndexStrategy, KeyringProviderType, PackageNameSpecifier, Reinstall,
+    RequiredVersion, TargetTriple, TrustedHost, TrustedPublishing, Upgrade,
 };
 use uv_distribution_types::{
     ConfigSettings, ExtraBuildVariables, Index, IndexUrl, IndexUrlError, PackageConfigSettings,
@@ -341,13 +341,12 @@ pub struct InstallerOptions {
     pub exclude_newer: Option<ExcludeNewerTimestamp>,
     pub link_mode: Option<LinkMode>,
     pub compile_bytecode: Option<bool>,
-    pub reinstall: Option<bool>,
-    pub reinstall_package: Option<Vec<PackageName>>,
+    pub reinstall: Option<Reinstall>,
+    pub build_isolation: Option<BuildIsolation>,
     pub no_build: Option<bool>,
     pub no_build_package: Option<Vec<PackageName>>,
     pub no_binary: Option<bool>,
     pub no_binary_package: Option<Vec<PackageName>>,
-    pub no_build_isolation: Option<bool>,
     pub no_sources: Option<bool>,
 }
 
@@ -370,12 +369,11 @@ pub struct ResolverOptions {
     pub exclude_newer: ExcludeNewer,
     pub link_mode: Option<LinkMode>,
     pub upgrade: Option<Upgrade>,
+    pub build_isolation: Option<BuildIsolation>,
     pub no_build: Option<bool>,
     pub no_build_package: Option<Vec<PackageName>>,
     pub no_binary: Option<bool>,
     pub no_binary_package: Option<Vec<PackageName>>,
-    pub no_build_isolation: Option<bool>,
-    pub no_build_isolation_package: Option<Vec<PackageName>>,
     pub extra_build_dependencies: Option<ExtraBuildDependencies>,
     pub extra_build_variables: Option<ExtraBuildVariables>,
     pub no_sources: Option<bool>,
@@ -398,8 +396,7 @@ pub struct ResolverInstallerOptions {
     pub dependency_metadata: Option<Vec<StaticMetadata>>,
     pub config_settings: Option<ConfigSettings>,
     pub config_settings_package: Option<PackageConfigSettings>,
-    pub no_build_isolation: Option<bool>,
-    pub no_build_isolation_package: Option<Vec<PackageName>>,
+    pub build_isolation: Option<BuildIsolation>,
     pub extra_build_dependencies: Option<ExtraBuildDependencies>,
     pub extra_build_variables: Option<ExtraBuildVariables>,
     pub exclude_newer: Option<ExcludeNewerTimestamp>,
@@ -463,8 +460,10 @@ impl From<ResolverInstallerSchema> for ResolverInstallerOptions {
             dependency_metadata,
             config_settings,
             config_settings_package,
-            no_build_isolation,
-            no_build_isolation_package,
+            build_isolation: BuildIsolation::from_args(
+                no_build_isolation,
+                no_build_isolation_package.into_iter().flatten().collect(),
+            ),
             extra_build_dependencies,
             extra_build_variables,
             exclude_newer,
@@ -1897,8 +1896,10 @@ impl From<ResolverInstallerSchema> for ResolverOptions {
             no_build_package: value.no_build_package,
             no_binary: value.no_binary,
             no_binary_package: value.no_binary_package,
-            no_build_isolation: value.no_build_isolation,
-            no_build_isolation_package: value.no_build_isolation_package,
+            build_isolation: BuildIsolation::from_args(
+                value.no_build_isolation,
+                value.no_build_isolation_package.unwrap_or_default(),
+            ),
             extra_build_dependencies: value.extra_build_dependencies,
             extra_build_variables: value.extra_build_variables,
             no_sources: value.no_sources,
@@ -1929,13 +1930,18 @@ impl From<ResolverInstallerSchema> for InstallerOptions {
             .global,
             link_mode: value.link_mode,
             compile_bytecode: value.compile_bytecode,
-            reinstall: value.reinstall,
-            reinstall_package: value.reinstall_package,
+            reinstall: Reinstall::from_args(
+                value.reinstall,
+                value.reinstall_package.unwrap_or_default(),
+            ),
+            build_isolation: BuildIsolation::from_args(
+                value.no_build_isolation,
+                value.no_build_isolation_package.unwrap_or_default(),
+            ),
             no_build: value.no_build,
             no_build_package: value.no_build_package,
             no_binary: value.no_binary,
             no_binary_package: value.no_binary_package,
-            no_build_isolation: value.no_build_isolation,
             no_sources: value.no_sources,
         }
     }
@@ -1964,8 +1970,7 @@ pub struct ToolOptions {
     pub dependency_metadata: Option<Vec<StaticMetadata>>,
     pub config_settings: Option<ConfigSettings>,
     pub config_settings_package: Option<PackageConfigSettings>,
-    pub no_build_isolation: Option<bool>,
-    pub no_build_isolation_package: Option<Vec<PackageName>>,
+    pub build_isolation: Option<BuildIsolation>,
     pub extra_build_dependencies: Option<ExtraBuildDependencies>,
     pub extra_build_variables: Option<ExtraBuildVariables>,
     pub exclude_newer: Option<ExcludeNewerTimestamp>,
@@ -1995,8 +2000,7 @@ impl From<ResolverInstallerOptions> for ToolOptions {
             dependency_metadata: value.dependency_metadata,
             config_settings: value.config_settings,
             config_settings_package: value.config_settings_package,
-            no_build_isolation: value.no_build_isolation,
-            no_build_isolation_package: value.no_build_isolation_package,
+            build_isolation: value.build_isolation,
             extra_build_dependencies: value.extra_build_dependencies,
             extra_build_variables: value.extra_build_variables,
             exclude_newer: value.exclude_newer,
@@ -2028,8 +2032,7 @@ impl From<ToolOptions> for ResolverInstallerOptions {
             dependency_metadata: value.dependency_metadata,
             config_settings: value.config_settings,
             config_settings_package: value.config_settings_package,
-            no_build_isolation: value.no_build_isolation,
-            no_build_isolation_package: value.no_build_isolation_package,
+            build_isolation: value.build_isolation,
             extra_build_dependencies: value.extra_build_dependencies,
             extra_build_variables: value.extra_build_variables,
             exclude_newer: value.exclude_newer,

crates/uv/src/commands/build_frontend.rs

@@ -14,8 +14,9 @@ use uv_build_backend::check_direct_build;
 use uv_cache::{Cache, CacheBucket};
 use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder};
 use uv_configuration::{
-    BuildKind, BuildOptions, BuildOutput, Concurrency, Constraints, DependencyGroupsWithDefaults,
-    HashCheckingMode, IndexStrategy, KeyringProviderType, Preview, SourceStrategy,
+    BuildIsolation, BuildKind, BuildOptions, BuildOutput, Concurrency, Constraints,
+    DependencyGroupsWithDefaults, HashCheckingMode, IndexStrategy, KeyringProviderType, Preview,
+    SourceStrategy,
 };
 use uv_dispatch::{BuildDispatch, SharedState};
 use uv_distribution::LoweredExtraBuildDependencies;
@@ -38,7 +39,7 @@ use uv_python::{
 use uv_requirements::RequirementsSource;
 use uv_resolver::{ExcludeNewer, FlatIndex};
 use uv_settings::PythonInstallMirrors;
-use uv_types::{AnyErrorBuild, BuildContext, BuildIsolation, BuildStack, HashStrategy};
+use uv_types::{AnyErrorBuild, BuildContext, BuildStack, HashStrategy};
 use uv_workspace::pyproject::ExtraBuildDependencies;
 use uv_workspace::{DiscoveryOptions, Workspace, WorkspaceCache, WorkspaceError};
 
@@ -200,8 +201,7 @@ async fn build_impl(
         dependency_metadata,
         config_setting,
         config_settings_package,
-        no_build_isolation,
-        no_build_isolation_package,
+        build_isolation,
         extra_build_dependencies,
         extra_build_variables,
         exclude_newer,
@@ -348,8 +348,7 @@ async fn build_impl(
             build_logs,
             force_pep517,
             build_constraints,
-            *no_build_isolation,
-            no_build_isolation_package,
+            build_isolation,
             extra_build_dependencies,
             extra_build_variables,
             *index_strategy,
@@ -450,8 +449,7 @@ async fn build_package(
     build_logs: bool,
     force_pep517: bool,
     build_constraints: &[RequirementsSource],
-    no_build_isolation: bool,
-    no_build_isolation_package: &[PackageName],
+    build_isolation: &BuildIsolation,
     extra_build_dependencies: &ExtraBuildDependencies,
     extra_build_variables: &ExtraBuildVariables,
     index_strategy: IndexStrategy,
@@ -566,14 +564,16 @@ async fn build_package(
 
     // Determine whether to enable build isolation.
     let environment;
-    let build_isolation = if no_build_isolation {
-        environment = PythonEnvironment::from_interpreter(interpreter.clone());
-        BuildIsolation::Shared(&environment)
-    } else if no_build_isolation_package.is_empty() {
-        BuildIsolation::Isolated
-    } else {
-        environment = PythonEnvironment::from_interpreter(interpreter.clone());
-        BuildIsolation::SharedPackage(&environment, no_build_isolation_package)
+    let types_build_isolation = match build_isolation {
+        BuildIsolation::Isolate => uv_types::BuildIsolation::Isolated,
+        BuildIsolation::Shared => {
+            environment = PythonEnvironment::from_interpreter(interpreter.clone());
+            uv_types::BuildIsolation::Shared(&environment)
+        }
+        BuildIsolation::SharedPackage(packages) => {
+            environment = PythonEnvironment::from_interpreter(interpreter.clone());
+            uv_types::BuildIsolation::SharedPackage(&environment, packages)
+        }
     };
 
     // Resolve the flat indexes from `--find-links`.
@@ -606,7 +606,7 @@ async fn build_package(
         index_strategy,
         config_setting,
         config_settings_package,
-        build_isolation,
+        types_build_isolation,
         &extra_build_requires,
         extra_build_variables,
         link_mode,

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

@@ -13,8 +13,8 @@ use tracing::debug;
 use uv_cache::Cache;
 use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder};
 use uv_configuration::{
-    BuildOptions, Concurrency, Constraints, ExportFormat, ExtrasSpecification, IndexStrategy,
-    NoBinary, NoBuild, Preview, PreviewFeatures, Reinstall, SourceStrategy, Upgrade,
+    BuildIsolation, BuildOptions, Concurrency, Constraints, ExportFormat, ExtrasSpecification,
+    IndexStrategy, NoBinary, NoBuild, Preview, PreviewFeatures, Reinstall, SourceStrategy, Upgrade,
 };
 use uv_configuration::{KeyringProviderType, TargetTriple};
 use uv_dispatch::{BuildDispatch, SharedState};
@@ -45,7 +45,7 @@ use uv_resolver::{
 };
 use uv_static::EnvVars;
 use uv_torch::{TorchMode, TorchStrategy};
-use uv_types::{BuildIsolation, EmptyInstalledPackages, HashStrategy};
+use uv_types::{EmptyInstalledPackages, HashStrategy};
 use uv_warnings::{warn_user, warn_user_once};
 use uv_workspace::WorkspaceCache;
 use uv_workspace::pyproject::ExtraBuildDependencies;
@@ -96,8 +96,7 @@ pub(crate) async fn pip_compile(
     network_settings: &NetworkSettings,
     config_settings: ConfigSettings,
     config_settings_package: PackageConfigSettings,
-    no_build_isolation: bool,
-    no_build_isolation_package: Vec<PackageName>,
+    build_isolation: BuildIsolation,
     extra_build_dependencies: &ExtraBuildDependencies,
     extra_build_variables: &ExtraBuildVariables,
     build_options: BuildOptions,
@@ -466,14 +465,16 @@ pub(crate) async fn pip_compile(
 
     // Determine whether to enable build isolation.
     let environment;
-    let build_isolation = if no_build_isolation {
-        environment = PythonEnvironment::from_interpreter(interpreter.clone());
-        BuildIsolation::Shared(&environment)
-    } else if no_build_isolation_package.is_empty() {
-        BuildIsolation::Isolated
-    } else {
-        environment = PythonEnvironment::from_interpreter(interpreter.clone());
-        BuildIsolation::SharedPackage(&environment, &no_build_isolation_package)
+    let types_build_isolation = match build_isolation {
+        BuildIsolation::Isolate => uv_types::BuildIsolation::Isolated,
+        BuildIsolation::Shared => {
+            environment = PythonEnvironment::from_interpreter(interpreter.clone());
+            uv_types::BuildIsolation::Shared(&environment)
+        }
+        BuildIsolation::SharedPackage(ref packages) => {
+            environment = PythonEnvironment::from_interpreter(interpreter.clone());
+            uv_types::BuildIsolation::SharedPackage(&environment, packages)
+        }
     };
 
     // Don't enforce hashes in `pip compile`.
@@ -502,7 +503,7 @@ pub(crate) async fn pip_compile(
         index_strategy,
         &config_settings,
         &config_settings_package,
-        build_isolation,
+        types_build_isolation,
         &extra_build_requires,
         extra_build_variables,
         link_mode,