mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-10-29 11:07:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Respect --no-build-isolation in uv add (#6368)

Browse source 
## Summary

We still had the default encoded here.

Closes https://github.com/astral-sh/uv/issues/6367.
This commit is contained in:
Charlie Marsh 2024-08-21 15:03:21 -04:00 • committed by GitHub
parent e7fb452552
commit 7fdd26c81f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/uv/src/commands/project/add.rs
View file

@ -3,12 +3,13 @@ use std::fmt::Write;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use cache_key::RepositoryUrl;
use owo_colors::OwoColorize; use owo_colors::OwoColorize;
use pep508_rs::{ExtraName, Requirement, VersionOrUrl};
use pypi_types::redact_git_credentials;
use rustc_hash::{FxBuildHasher, FxHashMap}; use rustc_hash::{FxBuildHasher, FxHashMap};
use tracing::debug; use tracing::debug;
use cache_key::RepositoryUrl;
use pep508_rs::{ExtraName, Requirement, VersionOrUrl};
use pypi_types::redact_git_credentials;
use uv_auth::{store_credentials_from_url, Credentials}; use uv_auth::{store_credentials_from_url, Credentials};
use uv_cache::Cache; use uv_cache::Cache;
use uv_client::{BaseClientBuilder, Connectivity, FlatIndexClient, RegistryClientBuilder}; use uv_client::{BaseClientBuilder, Connectivity, FlatIndexClient, RegistryClientBuilder};
@ -235,7 +236,8 @@ pub(crate) async fn add(
let python_version = None; let python_version = None;
let python_platform = None; let python_platform = None;
let hasher = HashStrategy::default(); let hasher = HashStrategy::default();
let build_isolation = BuildIsolation::default(); let build_constraints = [];
let sources = SourceStrategy::Enabled;
// Determine the environment for the resolution. // Determine the environment for the resolution.
let (tags, markers) = let (tags, markers) =
@ -254,6 +256,18 @@ pub(crate) async fn add(
.platform(target.interpreter().platform()) .platform(target.interpreter().platform())
.build(); .build();
// Determine whether to enable build isolation.
let environment;
let build_isolation = if settings.no_build_isolation {
environment = PythonEnvironment::from_interpreter(target.interpreter().clone());
BuildIsolation::Shared(&environment)
} else if settings.no_build_isolation_package.is_empty() {
BuildIsolation::Isolated
} else {
environment = PythonEnvironment::from_interpreter(target.interpreter().clone());
BuildIsolation::SharedPackage(&environment, &settings.no_build_isolation_package)
};
// Initialize any shared state. // Initialize any shared state.
let state = SharedState::default(); let state = SharedState::default();
@ -264,9 +278,6 @@ pub(crate) async fn add(
FlatIndex::from_entries(entries, Some(&tags), &hasher, &settings.build_options) FlatIndex::from_entries(entries, Some(&tags), &hasher, &settings.build_options)
}; };
let build_constraints = [];
let sources = SourceStrategy::Enabled;
// Create a build dispatch. // Create a build dispatch.
let build_dispatch = BuildDispatch::new( let build_dispatch = BuildDispatch::new(
&client, &client,