mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 10:58:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add BuildOptions for centralized combination of NoBuild and NoBinary (#4284)

Browse source 
As requested in review of https://github.com/astral-sh/uv/pull/4067
This commit is contained in:
Zanie Blue 2024-06-12 17:33:33 -04:00 • committed by GitHub
parent 1ab4041baa
commit 5a007b6b9f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 186 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/bench/benches/uv.rs
View file

@ -81,7 +81,7 @@ mod resolver {
use uv_cache::Cache;
use uv_client::RegistryClient;
use uv_configuration::{
Concurrency, ConfigSettings, NoBinary, NoBuild, PreviewMode, SetupPyStrategy,
BuildOptions, Concurrency, ConfigSettings, PreviewMode, SetupPyStrategy,
};
use uv_dispatch::BuildDispatch;
use uv_distribution::DistributionDatabase;
@ -137,6 +137,7 @@ mod resolver {
let installed_packages = EmptyInstalledPackages;
let interpreter = venv.interpreter();
let python_requirement = PythonRequirement::from_interpreter(interpreter);
let build_options = BuildOptions::default();
let build_context = BuildDispatch::new(
client,
@ -151,8 +152,7 @@ mod resolver {
&config_settings,
build_isolation,
LinkMode::default(),
&NoBuild::None,
&NoBinary::None,
&build_options,
concurrency,
PreviewMode::Disabled,
);

61
crates/uv-configuration/src/build_options.rs
View file

@ -32,6 +32,67 @@ impl Display for BuildKind {
}
}
#[derive(Debug, Default, Clone, PartialEq, Eq)]
pub struct BuildOptions {
no_binary: NoBinary,
no_build: NoBuild,
}
impl BuildOptions {
pub fn new(no_binary: NoBinary, no_build: NoBuild) -> Self {
Self {
no_binary,
no_build,
}
}
pub fn no_binary_package(&self, package_name: &PackageName) -> bool {
match &self.no_binary {
NoBinary::None => false,
NoBinary::All => match &self.no_build {
// Allow `all` to be overridden by specific build exclusions
NoBuild::Packages(packages) => !packages.contains(package_name),
_ => true,
},
NoBinary::Packages(packages) => packages.contains(package_name),
}
}
pub fn no_build_package(&self, package_name: &PackageName) -> bool {
match &self.no_build {
NoBuild::All => match &self.no_binary {
// Allow `all` to be overridden by specific binary exclusions
NoBinary::Packages(packages) => !packages.contains(package_name),
_ => true,
},
NoBuild::None => false,
NoBuild::Packages(packages) => packages.contains(package_name),
}
}
pub fn no_build(&self, package_name: Option<&PackageName>) -> bool {
match package_name {
Some(name) => self.no_build_package(name),
None => self.no_build_all(),
}
}
pub fn no_binary(&self, package_name: Option<&PackageName>) -> bool {
match package_name {
Some(name) => self.no_binary_package(name),
None => self.no_binary_all(),
}
}
pub fn no_build_all(&self) -> bool {
matches!(self.no_build, NoBuild::All)
}
pub fn no_binary_all(&self) -> bool {
matches!(self.no_binary, NoBinary::All)
}
}
#[derive(Debug, Default, Clone, PartialEq, Eq)]
pub enum NoBinary {
/// Allow installation of any wheel.

6
crates/uv-dev/src/build.rs
View file

@ -11,7 +11,7 @@ use uv_build::{SourceBuild, SourceBuildContext};
use uv_cache::{Cache, CacheArgs};
use uv_client::RegistryClientBuilder;
use uv_configuration::{
BuildKind, Concurrency, ConfigSettings, NoBinary, NoBuild, PreviewMode, SetupPyStrategy,
BuildKind, BuildOptions, Concurrency, ConfigSettings, PreviewMode, SetupPyStrategy,
};
use uv_dispatch::BuildDispatch;
use uv_git::GitResolver;
@ -66,6 +66,7 @@ pub(crate) async fn build(args: BuildArgs) -> Result<PathBuf> {
let index_urls = IndexLocations::default();
let setup_py = SetupPyStrategy::default();
let toolchain = Toolchain::find_virtualenv(&cache)?;
let build_options = BuildOptions::default();
let build_dispatch = BuildDispatch::new(
&client,
@ -80,8 +81,7 @@ pub(crate) async fn build(args: BuildArgs) -> Result<PathBuf> {
&config_settings,
BuildIsolation::Isolated,
install_wheel_rs::linker::LinkMode::default(),
&NoBuild::None,
&NoBinary::None,
&build_options,
concurrency,
PreviewMode::Enabled,
);

65
crates/uv-dispatch/src/lib.rs
View file

@ -5,7 +5,7 @@
use std::ffi::{OsStr, OsString};
use std::path::Path;
use anyhow::{bail, Context, Result};
use anyhow::{anyhow, Context, Result};
use futures::FutureExt;
use itertools::Itertools;
use rustc_hash::FxHashMap;
@ -16,7 +16,7 @@ use pypi_types::Requirement;
use uv_build::{SourceBuild, SourceBuildContext};
use uv_cache::Cache;
use uv_client::RegistryClient;
use uv_configuration::{BuildKind, ConfigSettings, NoBinary, NoBuild, Reinstall, SetupPyStrategy};
use uv_configuration::{BuildKind, BuildOptions, ConfigSettings, Reinstall, SetupPyStrategy};
use uv_configuration::{Concurrency, PreviewMode};
use uv_distribution::DistributionDatabase;
use uv_git::GitResolver;
@ -39,8 +39,7 @@ pub struct BuildDispatch<'a> {
setup_py: SetupPyStrategy,
build_isolation: BuildIsolation<'a>,
link_mode: install_wheel_rs::linker::LinkMode,
no_build: &'a NoBuild,
no_binary: &'a NoBinary,
build_options: &'a BuildOptions,
config_settings: &'a ConfigSettings,
source_build_context: SourceBuildContext,
options: Options,
@ -64,8 +63,7 @@ impl<'a> BuildDispatch<'a> {
config_settings: &'a ConfigSettings,
build_isolation: BuildIsolation<'a>,
link_mode: install_wheel_rs::linker::LinkMode,
no_build: &'a NoBuild,
no_binary: &'a NoBinary,
build_options: &'a BuildOptions,
concurrency: Concurrency,
preview_mode: PreviewMode,
) -> Self {
@ -82,8 +80,7 @@ impl<'a> BuildDispatch<'a> {
config_settings,
build_isolation,
link_mode,
no_build,
no_binary,
build_options,
concurrency,
source_build_context: SourceBuildContext::default(),
options: Options::default(),
@ -133,12 +130,8 @@ impl<'a> BuildContext for BuildDispatch<'a> {
self.build_isolation
}
fn no_build(&self) -> &NoBuild {
self.no_build
}
fn no_binary(&self) -> &NoBinary {
self.no_binary
fn build_options(&self) -> &BuildOptions {
self.build_options
}
fn index_locations(&self) -> &IndexLocations {
@ -217,8 +210,7 @@ impl<'a> BuildContext for BuildDispatch<'a> {
} = Planner::new(&requirements).build(
site_packages,
&Reinstall::default(),
&NoBinary::default(),
&NoBuild::default(),
&BuildOptions::default(),
&HashStrategy::default(),
self.index_locations,
self.cache(),
@ -315,34 +307,21 @@ impl<'a> BuildContext for BuildDispatch<'a> {
dist: Option<&'data SourceDist>,
build_kind: BuildKind,
) -> Result<SourceBuild> {
match self.no_build {
NoBuild::All => debug_assert!(
match self.no_binary {
// Allow `all` to be overridden by specific binary exclusions
NoBinary::Packages(packages) => {
if let Some(dist) = dist {
packages.contains(dist.name())
} else {
false
}
}
_ => false,
} || matches!(build_kind, BuildKind::Editable),
"Only editable builds are exempt from 'no build' checks"
),
NoBuild::None => {}
NoBuild::Packages(packages) => {
// We can only prevent builds by name for packages with names. For editable
// packages and unnamed requirements, we can't prevent the build.
if let Some(dist) = dist {
if packages.contains(dist.name()) {
bail!(
"Building source distributions for {} is disabled",
dist.name()
);
}
}
// Note we can only prevent builds by name for packages with names
// unless all builds are disabled.
if self
.build_options
.no_build(dist.map(distribution_types::Name::name))
// We always allow editable builds
&& !matches!(build_kind, BuildKind::Editable)
{
if let Some(dist) = dist {
return Err(anyhow!(
"Building source distributions for {} is disabled",
dist.name()
));
}
return Err(anyhow!("Building source distributions is disabled"));
}
let builder = SourceBuild::setup(

34
crates/uv-distribution/src/distribution_database.rs
View file

@ -25,7 +25,7 @@ use uv_cache::{ArchiveId, ArchiveTimestamp, CacheBucket, CacheEntry, Timestamp,
use uv_client::{
CacheControl, CachedClientError, Connectivity, DataWithCachePolicy, RegistryClient,
};
use uv_configuration::{NoBinary, NoBuild, PreviewMode};
use uv_configuration::PreviewMode;
use uv_extract::hash::Hasher;
use uv_fs::write_atomic;
use uv_types::BuildContext;
@ -145,17 +145,11 @@ impl<'a, Context: BuildContext> DistributionDatabase<'a, Context> {
dist: &BuiltDist,
hashes: HashPolicy<'_>,
) -> Result<LocalWheel, Error> {
let no_binary = match self.build_context.no_binary() {
NoBinary::None => false,
NoBinary::All => match self.build_context.no_build() {
// Allow `all` to be overridden by specific build exclusions
NoBuild::Packages(packages) => !packages.contains(dist.name()),
_ => true,
},
NoBinary::Packages(packages) => packages.contains(dist.name()),
};
if no_binary {
if self
.build_context
.build_options()
.no_binary_package(dist.name())
{
return Err(Error::NoBinary);
}
@ -418,22 +412,8 @@ impl<'a, Context: BuildContext> DistributionDatabase<'a, Context> {
source: &BuildableSource<'_>,
hashes: HashPolicy<'_>,
) -> Result<ArchiveMetadata, Error> {
let no_build = match self.build_context.no_build() {
NoBuild::All => match self.build_context.no_binary() {
// Allow `all` to be overridden by specific binary exclusions
NoBinary::Packages(packages) => {
!source.name().is_some_and(|name| packages.contains(name))
}
_ => true,
},
NoBuild::None => false,
NoBuild::Packages(packages) => {
source.name().is_some_and(|name| packages.contains(name))
}
};
// Optimization: Skip source dist download when we must not build them anyway.
if no_build {
if self.build_context.build_options().no_build(source.name()) {
if source.is_editable() {
debug!("Allowing build for editable source distribution: {source}");
} else {

18
crates/uv-distribution/src/source/mod.rs
View file

@ -28,7 +28,7 @@ use uv_cache::{
use uv_client::{
CacheControl, CachedClientError, Connectivity, DataWithCachePolicy, RegistryClient,
};
use uv_configuration::{BuildKind, NoBinary, NoBuild, PreviewMode};
use uv_configuration::{BuildKind, PreviewMode};
use uv_extract::hash::Hasher;
use uv_fs::{write_atomic, LockedFile};
use uv_types::{BuildContext, SourceBuildTrait};
@ -1390,21 +1390,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
debug!("Building: {source}");
// Guard against build of source distributions when disabled.
let no_build = match self.build_context.no_build() {
NoBuild::All => match self.build_context.no_binary() {
// Allow `all` to be overridden by specific binary exclusions
NoBinary::Packages(packages) => {
!source.name().is_some_and(|name| packages.contains(name))
}
_ => true,
},
NoBuild::None => false,
NoBuild::Packages(packages) => {
source.name().is_some_and(|name| packages.contains(name))
}
};
if no_build {
if self.build_context.build_options().no_build(source.name()) {
if source.is_editable() {
debug!("Allowing build for editable source distribution: {source}");
} else {

15
crates/uv-installer/src/plan.rs
View file

@ -16,7 +16,7 @@ use distribution_types::{
use platform_tags::Tags;
use pypi_types::{Requirement, RequirementSource};
use uv_cache::{ArchiveTimestamp, Cache, CacheBucket, WheelCache};
use uv_configuration::{NoBinary, NoBuild, Reinstall};
use uv_configuration::{BuildOptions, Reinstall};
use uv_distribution::{
BuiltWheelIndex, HttpArchivePointer, LocalArchivePointer, RegistryWheelIndex,
};
@ -56,8 +56,7 @@ impl<'a> Planner<'a> {
self,
mut site_packages: SitePackages,
reinstall: &Reinstall,
no_binary: &NoBinary,
no_build: &NoBuild,
build_options: &BuildOptions,
hasher: &HashStrategy,
index_locations: &IndexLocations,
cache: &Cache,
@ -108,15 +107,7 @@ impl<'a> Planner<'a> {
};
// Check if installation of a binary version of the package should be allowed.
let no_binary = match no_binary {
NoBinary::None => false,
NoBinary::All => match no_build {
// Allow `all` to be overridden by specific build exclusions
NoBuild::Packages(packages) => !packages.contains(&requirement.name),
_ => true,
},
NoBinary::Packages(packages) => packages.contains(&requirement.name),
};
let no_binary = build_options.no_binary_package(&requirement.name);
let installed_dists = site_packages.remove_packages(&requirement.name);

60
crates/uv-resolver/src/flat_index.rs
View file

@ -14,7 +14,7 @@ use pep440_rs::Version;
use platform_tags::{TagCompatibility, Tags};
use pypi_types::HashDigest;
use uv_client::FlatIndexEntries;
use uv_configuration::{NoBinary, NoBuild};
use uv_configuration::BuildOptions;
use uv_normalize::PackageName;
use uv_types::HashStrategy;
@ -36,8 +36,7 @@ impl FlatIndex {
entries: FlatIndexEntries,
tags: Option<&Tags>,
hasher: &HashStrategy,
no_build: &NoBuild,
no_binary: &NoBinary,
build_options: &BuildOptions,
) -> Self {
// Collect compatible distributions.
let mut index = FxHashMap::default();
@ -49,8 +48,7 @@ impl FlatIndex {
filename,
tags,
hasher,
no_build,
no_binary,
build_options,
url,
);
}
@ -68,8 +66,7 @@ impl FlatIndex {
filename: DistFilename,
tags: Option<&Tags>,
hasher: &HashStrategy,
no_build: &NoBuild,
no_binary: &NoBinary,
build_options: &BuildOptions,
index: IndexUrl,
) {
// No `requires-python` here: for source distributions, we don't have that information;
@ -78,14 +75,8 @@ impl FlatIndex {
DistFilename::WheelFilename(filename) => {
let version = filename.version.clone();
let compatibility = Self::wheel_compatibility(
&filename,
&file.hashes,
tags,
hasher,
no_binary,
no_build,
);
let compatibility =
Self::wheel_compatibility(&filename, &file.hashes, tags, hasher, build_options);
let dist = RegistryBuiltWheel {
filename,
file: Box::new(file),
@ -101,13 +92,8 @@ impl FlatIndex {
}
}
DistFilename::SourceDistFilename(filename) => {
let compatibility = Self::source_dist_compatibility(
&filename,
&file.hashes,
hasher,
no_build,
no_binary,
);
let compatibility =
Self::source_dist_compatibility(&filename, &file.hashes, hasher, build_options);
let dist = RegistrySourceDist {
name: filename.name.clone(),
version: filename.version.clone(),
@ -131,21 +117,10 @@ impl FlatIndex {
filename: &SourceDistFilename,
hashes: &[HashDigest],
hasher: &HashStrategy,
no_build: &NoBuild,
no_binary: &NoBinary,
build_options: &BuildOptions,
) -> SourceDistCompatibility {
// Check if source distributions are allowed for this package.
let no_build = match no_build {
NoBuild::None => false,
NoBuild::All => match no_binary {
// Allow `all` to be overridden by specific binary exclusions
NoBinary::Packages(packages) => !packages.contains(&filename.name),
_ => true,
},
NoBuild::Packages(packages) => packages.contains(&filename.name),
};
if no_build {
if build_options.no_build_package(&filename.name) {
return SourceDistCompatibility::Incompatible(IncompatibleSource::NoBuild);
}
@ -170,21 +145,10 @@ impl FlatIndex {
hashes: &[HashDigest],
tags: Option<&Tags>,
hasher: &HashStrategy,
no_binary: &NoBinary,
no_build: &NoBuild,
build_options: &BuildOptions,
) -> WheelCompatibility {
// Check if binaries are allowed for this package.
let no_binary = match no_binary {
NoBinary::None => false,
NoBinary::All => match no_build {
// Allow `all` to be overridden by specific build exclusions
NoBuild::Packages(packages) => !packages.contains(&filename.name),
_ => true,
},
NoBinary::Packages(packages) => packages.contains(&filename.name),
};
if no_binary {
if build_options.no_binary_package(&filename.name) {
return WheelCompatibility::Incompatible(IncompatibleWheel::NoBinary);
}

3
crates/uv-resolver/src/resolver/mod.rs
View file

@ -156,8 +156,7 @@ impl<'a, Context: BuildContext, InstalledPackages: InstalledPackagesProvider>
AllowedYanks::from_manifest(&manifest, markers, options.dependency_mode),
hasher,
options.exclude_newer,
build_context.no_binary(),
build_context.no_build(),
build_context.build_options(),
);
Self::new_custom_io(

14
crates/uv-resolver/src/resolver/provider.rs
View file

@ -2,7 +2,7 @@ use std::future::Future;
use distribution_types::{Dist, IndexLocations};
use platform_tags::Tags;
use uv_configuration::{NoBinary, NoBuild};
use uv_configuration::BuildOptions;
use uv_distribution::{ArchiveMetadata, DistributionDatabase};
use uv_normalize::PackageName;
use uv_types::{BuildContext, HashStrategy};
@ -81,8 +81,7 @@ pub struct DefaultResolverProvider<'a, Context: BuildContext> {
allowed_yanks: AllowedYanks,
hasher: HashStrategy,
exclude_newer: Option<ExcludeNewer>,
no_binary: NoBinary,
no_build: NoBuild,
build_options: &'a BuildOptions,
}
impl<'a, Context: BuildContext> DefaultResolverProvider<'a, Context> {
@ -96,8 +95,7 @@ impl<'a, Context: BuildContext> DefaultResolverProvider<'a, Context> {
allowed_yanks: AllowedYanks,
hasher: &'a HashStrategy,
exclude_newer: Option<ExcludeNewer>,
no_binary: &'a NoBinary,
no_build: &'a NoBuild,
build_options: &'a BuildOptions,
) -> Self {
Self {
fetcher,
@ -107,8 +105,7 @@ impl<'a, Context: BuildContext> DefaultResolverProvider<'a, Context> {
allowed_yanks,
hasher: hasher.clone(),
exclude_newer,
no_binary: no_binary.clone(),
no_build: no_build.clone(),
build_options,
}
}
}
@ -140,8 +137,7 @@ impl<'a, Context: BuildContext> ResolverProvider for DefaultResolverProvider<'a,
&self.hasher,
self.exclude_newer.as_ref(),
self.flat_index.get(package_name).cloned(),
&self.no_binary,
&self.no_build,
self.build_options,
)
})
.collect(),

31
crates/uv-resolver/src/version_map.rs
View file

@ -15,7 +15,7 @@ use pep440_rs::{Version, VersionSpecifiers};
use platform_tags::{TagCompatibility, Tags};
use pypi_types::{HashDigest, Yanked};
use uv_client::{OwnedArchive, SimpleMetadata, VersionFiles};
use uv_configuration::{NoBinary, NoBuild};
use uv_configuration::BuildOptions;
use uv_normalize::PackageName;
use uv_types::HashStrategy;
use uv_warnings::warn_user_once;
@ -51,8 +51,7 @@ impl VersionMap {
hasher: &HashStrategy,
exclude_newer: Option<&ExcludeNewer>,
flat_index: Option<FlatDistributions>,
no_binary: &NoBinary,
no_build: &NoBuild,
build_options: &BuildOptions,
) -> Self {
let mut map = BTreeMap::new();
// Create stubs for each entry in simple metadata. The full conversion
@ -96,28 +95,6 @@ impl VersionMap {
},
}
}
let (no_binary, no_build) = (
// Check if binaries are allowed for this package.
match no_binary {
NoBinary::None => false,
NoBinary::All => match no_build {
// Allow `all` to be overridden by specific build exclusions
NoBuild::Packages(packages) => !packages.contains(package_name),
_ => true,
},
NoBinary::Packages(packages) => packages.contains(package_name),
},
// Check if source distributions are allowed for this package.
match no_build {
NoBuild::None => false,
NoBuild::All => match no_binary {
// Allow `all` to be overridden by specific binary exclusions
NoBinary::Packages(packages) => !packages.contains(package_name),
_ => true,
},
NoBuild::Packages(packages) => packages.contains(package_name),
},
);
let allowed_yanks = allowed_yanks
.allowed_versions(package_name)
.cloned()
@ -127,8 +104,8 @@ impl VersionMap {
inner: VersionMapInner::Lazy(VersionMapLazy {
map,
simple_metadata,
no_binary,
no_build,
no_binary: build_options.no_binary_package(package_name),
no_build: build_options.no_build_package(package_name),
index: index.clone(),
tags: tags.cloned(),
python_requirement: python_requirement.clone(),

14
crates/uv-types/src/traits.rs
View file

@ -7,7 +7,7 @@ use distribution_types::{CachedDist, IndexLocations, InstalledDist, Resolution,
use pep508_rs::PackageName;
use pypi_types::Requirement;
use uv_cache::Cache;
use uv_configuration::{BuildKind, NoBinary, NoBuild, SetupPyStrategy};
use uv_configuration::{BuildKind, BuildOptions, SetupPyStrategy};
use uv_git::GitResolver;
use uv_toolchain::{Interpreter, PythonEnvironment};
@ -66,13 +66,11 @@ pub trait BuildContext {
/// Whether to enforce build isolation when building source distributions.
fn build_isolation(&self) -> BuildIsolation;
/// Whether source distribution building is disabled. This [`BuildContext::setup_build`] calls
/// will fail in this case. This method exists to avoid fetching source distributions if we know
/// we can't build them
fn no_build(&self) -> &NoBuild;
/// Whether using pre-built wheels is disabled.
fn no_binary(&self) -> &NoBinary;
/// Whether source distribution building or pre-built wheels is disabled.
///
/// This [`BuildContext::setup_build`] calls will fail if builds are disabled.
/// This method exists to avoid fetching source distributions if we know we can't build them.
fn build_options(&self) -> &BuildOptions;
/// The index locations being searched.
fn index_locations(&self) -> &IndexLocations;

16
crates/uv/src/commands/pip/compile.rs
View file

@ -21,8 +21,8 @@ use uv_auth::store_credentials_from_url;
use uv_cache::Cache;
use uv_client::{BaseClientBuilder, Connectivity, FlatIndexClient, RegistryClientBuilder};
use uv_configuration::{
Concurrency, ConfigSettings, Constraints, ExtrasSpecification, IndexStrategy, NoBinary,
NoBuild, Overrides, PreviewMode, SetupPyStrategy, Upgrade,
BuildOptions, Concurrency, ConfigSettings, Constraints, ExtrasSpecification, IndexStrategy,
NoBinary, NoBuild, Overrides, PreviewMode, SetupPyStrategy, Upgrade,
};
use uv_configuration::{KeyringProviderType, TargetTriple};
use uv_dispatch::BuildDispatch;
@ -253,11 +253,15 @@ pub(crate) async fn pip_compile(
let preferences = read_requirements_txt(output_file, &upgrade).await?;
let git = GitResolver::default();
// Combine the `--no-build` flags.
let no_build = no_build.combine(specified_no_build);
let build_options = BuildOptions::new(NoBinary::default(), no_build);
// Resolve the flat indexes from `--find-links`.
let flat_index = {
let client = FlatIndexClient::new(&client, &cache);
let entries = client.fetch(index_locations.flat_index()).await?;
FlatIndex::from_entries(entries, Some(&tags), &hasher, &no_build, &NoBinary::None)
FlatIndex::from_entries(entries, Some(&tags), &hasher, &build_options)
};
// Track in-flight downloads, builds, etc., across resolutions.
@ -272,9 +276,6 @@ pub(crate) async fn pip_compile(
BuildIsolation::Isolated
};
// Combine the `--no-build` flags.
let no_build = no_build.combine(specified_no_build);
let build_dispatch = BuildDispatch::new(
&client,
&cache,
@ -288,8 +289,7 @@ pub(crate) async fn pip_compile(
&config_settings,
build_isolation,
link_mode,
&no_build,
&NoBinary::None,
&build_options,
concurrency,
preview,
)

24
crates/uv/src/commands/pip/install.rs
View file

@ -12,8 +12,8 @@ use uv_auth::store_credentials_from_url;
use uv_cache::Cache;
use uv_client::{BaseClientBuilder, Connectivity, FlatIndexClient, RegistryClientBuilder};
use uv_configuration::{
Concurrency, ConfigSettings, ExtrasSpecification, IndexStrategy, NoBinary, NoBuild,
PreviewMode, Reinstall, SetupPyStrategy, Upgrade,
BuildOptions, Concurrency, ConfigSettings, ExtrasSpecification, IndexStrategy, NoBinary,
NoBuild, PreviewMode, Reinstall, SetupPyStrategy, Upgrade,
};
use uv_configuration::{KeyringProviderType, TargetTriple};
use uv_dispatch::BuildDispatch;
@ -263,11 +263,16 @@ pub(crate) async fn pip_install(
.platform(interpreter.platform())
.build();
// Combine the `--no-binary` and `--no-build` flags.
let no_binary = no_binary.combine(specified_no_binary);
let no_build = no_build.combine(specified_no_build);
let build_options = BuildOptions::new(no_binary, no_build);
// Resolve the flat indexes from `--find-links`.
let flat_index = {
let client = FlatIndexClient::new(&client, &cache);
let entries = client.fetch(index_locations.flat_index()).await?;
FlatIndex::from_entries(entries, Some(&tags), &hasher, &no_build, &no_binary)
FlatIndex::from_entries(entries, Some(&tags), &hasher, &build_options)
};
// Determine whether to enable build isolation.
@ -277,10 +282,6 @@ pub(crate) async fn pip_install(
BuildIsolation::Isolated
};
// Combine the `--no-binary` and `--no-build` flags.
let no_binary = no_binary.combine(specified_no_binary);
let no_build = no_build.combine(specified_no_build);
// Create a shared in-memory index.
let index = InMemoryIndex::default();
@ -301,8 +302,7 @@ pub(crate) async fn pip_install(
config_settings,
build_isolation,
link_mode,
&no_build,
&no_binary,
&build_options,
concurrency,
preview,
)
@ -376,8 +376,7 @@ pub(crate) async fn pip_install(
config_settings,
build_isolation,
link_mode,
&no_build,
&no_binary,
&build_options,
concurrency,
preview,
)
@ -390,8 +389,7 @@ pub(crate) async fn pip_install(
site_packages,
Modifications::Sufficient,
&reinstall,
&no_binary,
&no_build,
&build_options,
link_mode,
compile,
&index_locations,

10
crates/uv/src/commands/pip/operations.rs
View file

@ -21,8 +21,8 @@ use pypi_types::Requirement;
use uv_cache::Cache;
use uv_client::{BaseClientBuilder, RegistryClient};
use uv_configuration::{
Concurrency, Constraints, ExtrasSpecification, NoBinary, NoBuild, Overrides, PreviewMode,
Reinstall, Upgrade,
BuildOptions, Concurrency, Constraints, ExtrasSpecification, Overrides, PreviewMode, Reinstall,
Upgrade,
};
use uv_dispatch::BuildDispatch;
use uv_distribution::DistributionDatabase;
@ -289,8 +289,7 @@ pub(crate) async fn install(
site_packages: SitePackages,
modifications: Modifications,
reinstall: &Reinstall,
no_binary: &NoBinary,
no_build: &NoBuild,
build_options: &BuildOptions,
link_mode: LinkMode,
compile: bool,
index_urls: &IndexLocations,
@ -317,8 +316,7 @@ pub(crate) async fn install(
.build(
site_packages,
reinstall,
no_binary,
no_build,
build_options,
hasher,
index_urls,
cache,

24
crates/uv/src/commands/pip/sync.rs
View file

@ -11,8 +11,8 @@ use uv_auth::store_credentials_from_url;
use uv_cache::Cache;
use uv_client::{BaseClientBuilder, Connectivity, FlatIndexClient, RegistryClientBuilder};
use uv_configuration::{
Concurrency, ConfigSettings, ExtrasSpecification, IndexStrategy, NoBinary, NoBuild,
PreviewMode, Reinstall, SetupPyStrategy, Upgrade,
BuildOptions, Concurrency, ConfigSettings, ExtrasSpecification, IndexStrategy, NoBinary,
NoBuild, PreviewMode, Reinstall, SetupPyStrategy, Upgrade,
};
use uv_configuration::{KeyringProviderType, TargetTriple};
use uv_dispatch::BuildDispatch;
@ -206,11 +206,16 @@ pub(crate) async fn pip_sync(
.platform(interpreter.platform())
.build();
// Combine the `--no-binary` and `--no-build` flags.
let no_binary = no_binary.combine(specified_no_binary);
let no_build = no_build.combine(specified_no_build);
let build_options = BuildOptions::new(no_binary, no_build);
// Resolve the flat indexes from `--find-links`.
let flat_index = {
let client = FlatIndexClient::new(&client, &cache);
let entries = client.fetch(index_locations.flat_index()).await?;
FlatIndex::from_entries(entries, Some(&tags), &hasher, &no_build, &no_binary)
FlatIndex::from_entries(entries, Some(&tags), &hasher, &build_options)
};
// Determine whether to enable build isolation.
@ -220,10 +225,6 @@ pub(crate) async fn pip_sync(
BuildIsolation::Isolated
};
// Combine the `--no-binary` and `--no-build` flags.
let no_binary = no_binary.combine(specified_no_binary);
let no_build = no_build.combine(specified_no_build);
// Create a shared in-memory index.
let index = InMemoryIndex::default();
@ -251,8 +252,7 @@ pub(crate) async fn pip_sync(
config_settings,
build_isolation,
link_mode,
&no_build,
&no_binary,
&build_options,
concurrency,
preview,
)
@ -328,8 +328,7 @@ pub(crate) async fn pip_sync(
config_settings,
build_isolation,
link_mode,
&no_build,
&no_binary,
&build_options,
concurrency,
preview,
)
@ -342,8 +341,7 @@ pub(crate) async fn pip_sync(
site_packages,
Modifications::Exact,
reinstall,
&no_binary,
&no_build,
&build_options,
link_mode,
compile,
&index_locations,

10
crates/uv/src/commands/project/lock.rs
View file

@ -7,7 +7,7 @@ use install_wheel_rs::linker::LinkMode;
use uv_cache::Cache;
use uv_client::{FlatIndexClient, RegistryClientBuilder};
use uv_configuration::{
Concurrency, ConfigSettings, ExtrasSpecification, NoBinary, NoBuild, PreviewMode, Reinstall,
BuildOptions, Concurrency, ConfigSettings, ExtrasSpecification, PreviewMode, Reinstall,
SetupPyStrategy, Upgrade,
};
use uv_dispatch::BuildDispatch;
@ -162,8 +162,7 @@ pub(super) async fn do_lock(
let in_flight = InFlight::default();
let index = InMemoryIndex::default();
let link_mode = LinkMode::default();
let no_binary = NoBinary::default();
let no_build = NoBuild::default();
let build_options = BuildOptions::default();
let reinstall = Reinstall::default();
let setup_py = SetupPyStrategy::default();
@ -174,7 +173,7 @@ pub(super) async fn do_lock(
let flat_index = {
let client = FlatIndexClient::new(&client, cache);
let entries = client.fetch(index_locations.flat_index()).await?;
FlatIndex::from_entries(entries, None, &hasher, &no_build, &no_binary)
FlatIndex::from_entries(entries, None, &hasher, &build_options)
};
// If an existing lockfile exists, build up a set of preferences.
@ -197,8 +196,7 @@ pub(super) async fn do_lock(
&config_settings,
build_isolation,
link_mode,
&no_build,
&no_binary,
&build_options,
concurrency,
preview,
);

14
crates/uv/src/commands/project/mod.rs
View file

@ -11,7 +11,7 @@ use pep440_rs::{Version, VersionSpecifiers};
use uv_cache::Cache;
use uv_client::{BaseClientBuilder, Connectivity, RegistryClientBuilder};
use uv_configuration::{
Concurrency, ConfigSettings, ExtrasSpecification, NoBinary, NoBuild, PreviewMode, Reinstall,
BuildOptions, Concurrency, ConfigSettings, ExtrasSpecification, PreviewMode, Reinstall,
SetupPyStrategy, Upgrade,
};
use uv_dispatch::BuildDispatch;
@ -306,8 +306,7 @@ pub(crate) async fn update_environment(
let in_flight = InFlight::default();
let index = InMemoryIndex::default();
let link_mode = LinkMode::default();
let no_binary = NoBinary::default();
let no_build = NoBuild::default();
let build_options = BuildOptions::default();
let options = Options::default();
let preferences = Vec::default();
let reinstall = Reinstall::default();
@ -328,8 +327,7 @@ pub(crate) async fn update_environment(
&config_settings,
build_isolation,
link_mode,
&no_build,
&no_binary,
&build_options,
concurrency,
preview,
);
@ -388,8 +386,7 @@ pub(crate) async fn update_environment(
&config_settings,
build_isolation,
link_mode,
&no_build,
&no_binary,
&build_options,
concurrency,
preview,
)
@ -401,8 +398,7 @@ pub(crate) async fn update_environment(
site_packages,
pip::operations::Modifications::Sufficient,
&reinstall,
&no_binary,
&no_build,
&build_options,
link_mode,
compile,
index_locations,

13
crates/uv/src/commands/project/sync.rs
View file

@ -6,7 +6,7 @@ use install_wheel_rs::linker::LinkMode;
use uv_cache::Cache;
use uv_client::{FlatIndexClient, RegistryClientBuilder};
use uv_configuration::{
Concurrency, ConfigSettings, ExtrasSpecification, NoBinary, NoBuild, PreviewMode, Reinstall,
BuildOptions, Concurrency, ConfigSettings, ExtrasSpecification, PreviewMode, Reinstall,
SetupPyStrategy,
};
use uv_dispatch::BuildDispatch;
@ -127,8 +127,7 @@ pub(super) async fn do_sync(
let in_flight = InFlight::default();
let index = InMemoryIndex::default();
let link_mode = LinkMode::default();
let no_binary = NoBinary::default();
let no_build = NoBuild::default();
let build_options = BuildOptions::default();
let reinstall = Reinstall::default();
let setup_py = SetupPyStrategy::default();
@ -136,7 +135,7 @@ pub(super) async fn do_sync(
let flat_index = {
let client = FlatIndexClient::new(&client, cache);
let entries = client.fetch(index_locations.flat_index()).await?;
FlatIndex::from_entries(entries, Some(tags), &hasher, &no_build, &no_binary)
FlatIndex::from_entries(entries, Some(tags), &hasher, &build_options)
};
// Create a build dispatch.
@ -153,8 +152,7 @@ pub(super) async fn do_sync(
&config_settings,
build_isolation,
link_mode,
&no_build,
&no_binary,
&build_options,
concurrency,
preview,
);
@ -167,8 +165,7 @@ pub(super) async fn do_sync(
site_packages,
Modifications::Sufficient,
&reinstall,
&no_binary,
&no_build,
&build_options,
link_mode,
compile,
index_locations,

15
crates/uv/src/commands/venv.rs
View file

@ -15,8 +15,10 @@ use pypi_types::Requirement;
use uv_auth::store_credentials_from_url;
use uv_cache::Cache;
use uv_client::{BaseClientBuilder, Connectivity, FlatIndexClient, RegistryClientBuilder};
use uv_configuration::{Concurrency, KeyringProviderType, PreviewMode};
use uv_configuration::{ConfigSettings, IndexStrategy, NoBinary, NoBuild, SetupPyStrategy};
use uv_configuration::{
BuildOptions, Concurrency, ConfigSettings, IndexStrategy, KeyringProviderType, NoBinary,
NoBuild, PreviewMode, SetupPyStrategy,
};
use uv_dispatch::BuildDispatch;
use uv_fs::Simplified;
use uv_git::GitResolver;
@ -193,8 +195,7 @@ async fn venv_impl(
entries,
Some(tags),
&HashStrategy::None,
&NoBuild::All,
&NoBinary::None,
&BuildOptions::new(NoBinary::None, NoBuild::All),
)
};
@ -209,6 +210,9 @@ async fn venv_impl(
let config_settings = ConfigSettings::default();
let concurrency = Concurrency::default();
// Do not allow builds
let build_options = BuildOptions::new(NoBinary::None, NoBuild::All);
// Prep the build context.
let build_dispatch = BuildDispatch::new(
&client,
@ -223,8 +227,7 @@ async fn venv_impl(
&config_settings,
BuildIsolation::Isolated,
link_mode,
&NoBuild::All,
&NoBinary::None,
&build_options,
concurrency,
preview,
)