diff --git a/Cargo.lock b/Cargo.lock index 56ba88821..d38ea4835 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5093,14 +5093,12 @@ dependencies = [ "schemars", "serde", "serde-untagged", - "serde_json", "thiserror 2.0.12", "tracing", "url", "uv-auth", "uv-cache", "uv-cache-info", - "uv-cache-key", "uv-distribution-types", "uv-git", "uv-normalize", diff --git a/crates/uv-bench/benches/uv.rs b/crates/uv-bench/benches/uv.rs index 9809a6814..62d122abb 100644 --- a/crates/uv-bench/benches/uv.rs +++ b/crates/uv-bench/benches/uv.rs @@ -86,13 +86,13 @@ mod resolver { use uv_cache::Cache; use uv_client::RegistryClient; use uv_configuration::{ - BuildOptions, Concurrency, ConfigSettings, Constraints, IndexStrategy, - PackageConfigSettings, Preview, SourceStrategy, + BuildOptions, Concurrency, Constraints, IndexStrategy, Preview, SourceStrategy, }; use uv_dispatch::{BuildDispatch, SharedState}; use uv_distribution::DistributionDatabase; use uv_distribution_types::{ - DependencyMetadata, ExtraBuildRequires, ExtraBuildVariables, IndexLocations, RequiresPython, + ConfigSettings, DependencyMetadata, ExtraBuildRequires, ExtraBuildVariables, + IndexLocations, PackageConfigSettings, RequiresPython, }; use uv_install_wheel::LinkMode; use uv_pep440::Version; diff --git a/crates/uv-build-frontend/src/lib.rs b/crates/uv-build-frontend/src/lib.rs index c9fe63947..86fff042e 100644 --- a/crates/uv-build-frontend/src/lib.rs +++ b/crates/uv-build-frontend/src/lib.rs @@ -30,9 +30,11 @@ use tracing::{Instrument, debug, info_span, instrument, warn}; use uv_cache_key::cache_digest; use uv_configuration::Preview; -use uv_configuration::{BuildKind, BuildOutput, ConfigSettings, SourceStrategy}; +use uv_configuration::{BuildKind, BuildOutput, SourceStrategy}; use uv_distribution::BuildRequires; -use uv_distribution_types::{ExtraBuildRequires, IndexLocations, Requirement, Resolution}; +use uv_distribution_types::{ + ConfigSettings, ExtraBuildRequires, IndexLocations, Requirement, Resolution, +}; use uv_fs::LockedFile; use uv_fs::{PythonExt, Simplified}; use uv_pep440::Version; diff --git a/crates/uv-cli/src/lib.rs b/crates/uv-cli/src/lib.rs index af04737ec..f89ebf90d 100644 --- a/crates/uv-cli/src/lib.rs +++ b/crates/uv-cli/src/lib.rs @@ -10,11 +10,13 @@ use clap::{Args, Parser, Subcommand}; use uv_cache::CacheArgs; use uv_configuration::{ - ConfigSettingEntry, ConfigSettingPackageEntry, ExportFormat, IndexStrategy, - KeyringProviderType, PackageNameSpecifier, PreviewFeatures, ProjectBuildBackend, TargetTriple, - TrustedHost, TrustedPublishing, VersionControlSystem, + ExportFormat, IndexStrategy, KeyringProviderType, PackageNameSpecifier, PreviewFeatures, + ProjectBuildBackend, TargetTriple, TrustedHost, TrustedPublishing, VersionControlSystem, +}; +use uv_distribution_types::{ + ConfigSettingEntry, ConfigSettingPackageEntry, Index, IndexUrl, Origin, PipExtraIndex, + PipFindLinks, PipIndex, }; -use uv_distribution_types::{Index, IndexUrl, Origin, PipExtraIndex, PipFindLinks, PipIndex}; use uv_normalize::{ExtraName, GroupName, PackageName, PipGroupName}; use uv_pep508::{MarkerTree, Requirement}; use uv_pypi_types::VerbatimParsedUrl; diff --git a/crates/uv-cli/src/options.rs b/crates/uv-cli/src/options.rs index e8aab9945..ba80736a0 100644 --- a/crates/uv-cli/src/options.rs +++ b/crates/uv-cli/src/options.rs @@ -1,7 +1,7 @@ use anstream::eprintln; use uv_cache::Refresh; -use uv_configuration::{ConfigSettings, PackageConfigSettings}; +use uv_distribution_types::{ConfigSettings, PackageConfigSettings}; use uv_resolver::{ExcludeNewer, ExcludeNewerPackage, PrereleaseMode}; use uv_settings::{Combine, PipOptions, ResolverInstallerOptions, ResolverOptions}; use uv_warnings::owo_colors::OwoColorize; diff --git a/crates/uv-configuration/Cargo.toml b/crates/uv-configuration/Cargo.toml index 807340a01..515ac217c 100644 --- a/crates/uv-configuration/Cargo.toml +++ b/crates/uv-configuration/Cargo.toml @@ -19,7 +19,6 @@ workspace = true uv-auth = { workspace = true } uv-cache = { workspace = true } uv-cache-info = { workspace = true } -uv-cache-key = { workspace = true } uv-distribution-types = { workspace = true } uv-git = { workspace = true } uv-normalize = { workspace = true } @@ -39,7 +38,6 @@ same-file = { workspace = true } schemars = { workspace = true, optional = true } serde = { workspace = true } serde-untagged = { workspace = true } -serde_json = { workspace = true } thiserror = { workspace = true } tracing = { workspace = true } url = { workspace = true } diff --git a/crates/uv-configuration/src/lib.rs b/crates/uv-configuration/src/lib.rs index ffc15c2d3..7ba32e716 100644 --- a/crates/uv-configuration/src/lib.rs +++ b/crates/uv-configuration/src/lib.rs @@ -1,7 +1,6 @@ pub use authentication::*; pub use build_options::*; pub use concurrency::*; -pub use config_settings::*; pub use constraints::*; pub use dependency_groups::*; pub use dry_run::*; @@ -26,7 +25,6 @@ pub use vcs::*; mod authentication; mod build_options; mod concurrency; -mod config_settings; mod constraints; mod dependency_groups; mod dry_run; diff --git a/crates/uv-dispatch/src/lib.rs b/crates/uv-dispatch/src/lib.rs index 31b6b8b26..8711e62d8 100644 --- a/crates/uv-dispatch/src/lib.rs +++ b/crates/uv-dispatch/src/lib.rs @@ -17,16 +17,15 @@ use uv_build_frontend::{SourceBuild, SourceBuildContext}; use uv_cache::Cache; use uv_client::RegistryClient; use uv_configuration::{ - BuildKind, BuildOptions, ConfigSettings, Constraints, IndexStrategy, PackageConfigSettings, - Preview, Reinstall, SourceStrategy, + BuildKind, BuildOptions, Constraints, IndexStrategy, Preview, Reinstall, SourceStrategy, }; use uv_configuration::{BuildOutput, Concurrency}; use uv_distribution::DistributionDatabase; use uv_distribution_filename::DistFilename; use uv_distribution_types::{ - CachedDist, DependencyMetadata, ExtraBuildRequires, ExtraBuildVariables, Identifier, - IndexCapabilities, IndexLocations, IsBuildBackendError, Name, Requirement, Resolution, - SourceDist, VersionOrUrlRef, + CachedDist, ConfigSettings, DependencyMetadata, ExtraBuildRequires, ExtraBuildVariables, + Identifier, IndexCapabilities, IndexLocations, IsBuildBackendError, Name, + PackageConfigSettings, Requirement, Resolution, SourceDist, VersionOrUrlRef, }; use uv_git::GitResolver; use uv_installer::{Installer, Plan, Planner, Preparer, SitePackages}; diff --git a/crates/uv-configuration/src/config_settings.rs b/crates/uv-distribution-types/src/config_settings.rs similarity index 100% rename from crates/uv-configuration/src/config_settings.rs rename to crates/uv-distribution-types/src/config_settings.rs diff --git a/crates/uv-distribution-types/src/lib.rs b/crates/uv-distribution-types/src/lib.rs index 74021914b..8b87de18e 100644 --- a/crates/uv-distribution-types/src/lib.rs +++ b/crates/uv-distribution-types/src/lib.rs @@ -57,6 +57,7 @@ pub use crate::any::*; pub use crate::build_requires::*; pub use crate::buildable::*; pub use crate::cached::*; +pub use crate::config_settings::*; pub use crate::dependency_metadata::*; pub use crate::diagnostic::*; pub use crate::dist_error::*; @@ -86,6 +87,7 @@ mod any; mod build_requires; mod buildable; mod cached; +mod config_settings; mod dependency_metadata; mod diagnostic; mod dist_error; diff --git a/crates/uv-distribution/src/index/built_wheel_index.rs b/crates/uv-distribution/src/index/built_wheel_index.rs index aed0819ca..8d29f264c 100644 --- a/crates/uv-distribution/src/index/built_wheel_index.rs +++ b/crates/uv-distribution/src/index/built_wheel_index.rs @@ -3,10 +3,10 @@ use std::borrow::Cow; use uv_cache::{Cache, CacheBucket, CacheShard, WheelCache}; use uv_cache_info::CacheInfo; use uv_cache_key::cache_digest; -use uv_configuration::{ConfigSettings, PackageConfigSettings}; use uv_distribution_types::{ - BuildVariables, DirectUrlSourceDist, DirectorySourceDist, ExtraBuildRequirement, - ExtraBuildRequires, ExtraBuildVariables, GitSourceDist, Hashed, PathSourceDist, + BuildVariables, ConfigSettings, DirectUrlSourceDist, DirectorySourceDist, + ExtraBuildRequirement, ExtraBuildRequires, ExtraBuildVariables, GitSourceDist, Hashed, + PackageConfigSettings, PathSourceDist, }; use uv_normalize::PackageName; use uv_platform_tags::Tags; diff --git a/crates/uv-distribution/src/index/registry_wheel_index.rs b/crates/uv-distribution/src/index/registry_wheel_index.rs index b88987122..2df5d4229 100644 --- a/crates/uv-distribution/src/index/registry_wheel_index.rs +++ b/crates/uv-distribution/src/index/registry_wheel_index.rs @@ -5,10 +5,9 @@ use rustc_hash::{FxHashMap, FxHashSet}; use uv_cache::{Cache, CacheBucket, WheelCache}; use uv_cache_key::cache_digest; -use uv_configuration::{ConfigSettings, PackageConfigSettings}; use uv_distribution_types::{ - BuildVariables, CachedRegistryDist, ExtraBuildRequirement, ExtraBuildRequires, - ExtraBuildVariables, Hashed, Index, IndexLocations, IndexUrl, + BuildVariables, CachedRegistryDist, ConfigSettings, ExtraBuildRequirement, ExtraBuildRequires, + ExtraBuildVariables, Hashed, Index, IndexLocations, IndexUrl, PackageConfigSettings, }; use uv_fs::{directories, files}; use uv_normalize::PackageName; diff --git a/crates/uv-distribution/src/source/mod.rs b/crates/uv-distribution/src/source/mod.rs index 08a88f87a..ddd7c2732 100644 --- a/crates/uv-distribution/src/source/mod.rs +++ b/crates/uv-distribution/src/source/mod.rs @@ -29,11 +29,11 @@ use uv_cache_key::cache_digest; use uv_client::{ CacheControl, CachedClientError, Connectivity, DataWithCachePolicy, RegistryClient, }; -use uv_configuration::{BuildKind, BuildOutput, ConfigSettings, SourceStrategy}; +use uv_configuration::{BuildKind, BuildOutput, SourceStrategy}; use uv_distribution_filename::{SourceDistExtension, WheelFilename}; use uv_distribution_types::{ - BuildVariables, BuildableSource, DirectorySourceUrl, ExtraBuildRequirement, GitSourceUrl, - HashPolicy, Hashed, IndexUrl, PathSourceUrl, SourceDist, SourceUrl, + BuildVariables, BuildableSource, ConfigSettings, DirectorySourceUrl, ExtraBuildRequirement, + GitSourceUrl, HashPolicy, Hashed, IndexUrl, PathSourceUrl, SourceDist, SourceUrl, }; use uv_extract::hash::Hasher; use uv_fs::{rename_with_retry, write_atomic}; diff --git a/crates/uv-installer/src/plan.rs b/crates/uv-installer/src/plan.rs index a8b398d12..9fb869d6f 100644 --- a/crates/uv-installer/src/plan.rs +++ b/crates/uv-installer/src/plan.rs @@ -6,15 +6,15 @@ use tracing::{debug, warn}; use uv_cache::{Cache, CacheBucket, WheelCache}; use uv_cache_info::Timestamp; -use uv_configuration::{BuildOptions, ConfigSettings, PackageConfigSettings, Reinstall}; +use uv_configuration::{BuildOptions, Reinstall}; use uv_distribution::{ BuiltWheelIndex, HttpArchivePointer, LocalArchivePointer, RegistryWheelIndex, }; use uv_distribution_filename::WheelFilename; use uv_distribution_types::{ - BuiltDist, CachedDirectUrlDist, CachedDist, Dist, Error, ExtraBuildRequires, - ExtraBuildVariables, Hashed, IndexLocations, InstalledDist, Name, RequirementSource, - Resolution, ResolvedDist, SourceDist, + BuiltDist, CachedDirectUrlDist, CachedDist, ConfigSettings, Dist, Error, ExtraBuildRequires, + ExtraBuildVariables, Hashed, IndexLocations, InstalledDist, Name, PackageConfigSettings, + RequirementSource, Resolution, ResolvedDist, SourceDist, }; use uv_fs::Simplified; use uv_platform_tags::{IncompatibleTag, TagCompatibility, Tags}; diff --git a/crates/uv-settings/src/combine.rs b/crates/uv-settings/src/combine.rs index 15aedec33..3a297276f 100644 --- a/crates/uv-settings/src/combine.rs +++ b/crates/uv-settings/src/combine.rs @@ -4,11 +4,12 @@ use std::{collections::BTreeMap, num::NonZeroUsize}; use url::Url; use uv_configuration::{ - ConfigSettings, ExportFormat, IndexStrategy, KeyringProviderType, PackageConfigSettings, - RequiredVersion, TargetTriple, TrustedPublishing, + ExportFormat, IndexStrategy, KeyringProviderType, RequiredVersion, TargetTriple, + TrustedPublishing, }; use uv_distribution_types::{ - ExtraBuildVariables, Index, IndexUrl, PipExtraIndex, PipFindLinks, PipIndex, + ConfigSettings, ExtraBuildVariables, Index, IndexUrl, PackageConfigSettings, PipExtraIndex, + PipFindLinks, PipIndex, }; use uv_install_wheel::LinkMode; use uv_pypi_types::{SchemaConflicts, SupportedEnvironments}; diff --git a/crates/uv-settings/src/settings.rs b/crates/uv-settings/src/settings.rs index b2c10107b..cc3b61066 100644 --- a/crates/uv-settings/src/settings.rs +++ b/crates/uv-settings/src/settings.rs @@ -4,12 +4,12 @@ use serde::{Deserialize, Serialize}; use uv_cache_info::CacheKey; use uv_configuration::{ - ConfigSettings, IndexStrategy, KeyringProviderType, PackageConfigSettings, - PackageNameSpecifier, RequiredVersion, TargetTriple, TrustedHost, TrustedPublishing, + IndexStrategy, KeyringProviderType, PackageNameSpecifier, RequiredVersion, TargetTriple, + TrustedHost, TrustedPublishing, }; use uv_distribution_types::{ - ExtraBuildVariables, Index, IndexUrl, IndexUrlError, PipExtraIndex, PipFindLinks, PipIndex, - StaticMetadata, + ConfigSettings, ExtraBuildVariables, Index, IndexUrl, IndexUrlError, PackageConfigSettings, + PipExtraIndex, PipFindLinks, PipIndex, StaticMetadata, }; use uv_install_wheel::LinkMode; use uv_macros::{CombineOptions, OptionsMetadata}; @@ -24,7 +24,8 @@ use uv_resolver::{ }; use uv_static::EnvVars; use uv_torch::TorchMode; -use uv_workspace::{pyproject::ExtraBuildDependencies, pyproject_mut::AddBoundsKind}; +use uv_workspace::pyproject::ExtraBuildDependencies; +use uv_workspace::pyproject_mut::AddBoundsKind; /// A `pyproject.toml` with an (optional) `[tool.uv]` section. #[allow(dead_code)] diff --git a/crates/uv-types/src/traits.rs b/crates/uv-types/src/traits.rs index 87bf76d6e..e6714a402 100644 --- a/crates/uv-types/src/traits.rs +++ b/crates/uv-types/src/traits.rs @@ -7,14 +7,12 @@ use anyhow::Result; use rustc_hash::FxHashSet; use uv_cache::Cache; -use uv_configuration::{ - BuildKind, BuildOptions, BuildOutput, ConfigSettings, PackageConfigSettings, SourceStrategy, -}; +use uv_configuration::{BuildKind, BuildOptions, BuildOutput, SourceStrategy}; use uv_distribution_filename::DistFilename; use uv_distribution_types::{ - CachedDist, DependencyMetadata, DistributionId, ExtraBuildRequires, ExtraBuildVariables, - IndexCapabilities, IndexLocations, InstalledDist, IsBuildBackendError, Requirement, Resolution, - SourceDist, + CachedDist, ConfigSettings, DependencyMetadata, DistributionId, ExtraBuildRequires, + ExtraBuildVariables, IndexCapabilities, IndexLocations, InstalledDist, IsBuildBackendError, + PackageConfigSettings, Requirement, Resolution, SourceDist, }; use uv_git::GitResolver; use uv_pep508::PackageName; diff --git a/crates/uv/src/commands/build_frontend.rs b/crates/uv/src/commands/build_frontend.rs index 62d00a226..1f7a8ed7f 100644 --- a/crates/uv/src/commands/build_frontend.rs +++ b/crates/uv/src/commands/build_frontend.rs @@ -14,9 +14,8 @@ 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, ConfigSettings, Constraints, - DependencyGroupsWithDefaults, HashCheckingMode, IndexStrategy, KeyringProviderType, - PackageConfigSettings, Preview, SourceStrategy, + BuildKind, BuildOptions, BuildOutput, Concurrency, Constraints, DependencyGroupsWithDefaults, + HashCheckingMode, IndexStrategy, KeyringProviderType, Preview, SourceStrategy, }; use uv_dispatch::{BuildDispatch, SharedState}; use uv_distribution::LoweredExtraBuildDependencies; @@ -24,7 +23,8 @@ use uv_distribution_filename::{ DistFilename, SourceDistExtension, SourceDistFilename, WheelFilename, }; use uv_distribution_types::{ - DependencyMetadata, ExtraBuildVariables, Index, IndexLocations, RequiresPython, SourceDist, + ConfigSettings, DependencyMetadata, ExtraBuildVariables, Index, IndexLocations, + PackageConfigSettings, RequiresPython, SourceDist, }; use uv_fs::{Simplified, relative_to}; use uv_install_wheel::LinkMode; diff --git a/crates/uv/src/commands/pip/compile.rs b/crates/uv/src/commands/pip/compile.rs index 241d0aea3..40aaaca3c 100644 --- a/crates/uv/src/commands/pip/compile.rs +++ b/crates/uv/src/commands/pip/compile.rs @@ -13,16 +13,15 @@ use tracing::debug; use uv_cache::Cache; use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder}; use uv_configuration::{ - BuildOptions, Concurrency, ConfigSettings, Constraints, ExportFormat, ExtrasSpecification, - IndexStrategy, NoBinary, NoBuild, PackageConfigSettings, Preview, PreviewFeatures, Reinstall, - SourceStrategy, Upgrade, + BuildOptions, Concurrency, Constraints, ExportFormat, ExtrasSpecification, IndexStrategy, + NoBinary, NoBuild, Preview, PreviewFeatures, Reinstall, SourceStrategy, Upgrade, }; use uv_configuration::{KeyringProviderType, TargetTriple}; use uv_dispatch::{BuildDispatch, SharedState}; use uv_distribution::LoweredExtraBuildDependencies; use uv_distribution_types::{ - DependencyMetadata, ExtraBuildVariables, HashGeneration, Index, IndexLocations, - NameRequirementSpecification, Origin, Requirement, RequiresPython, + ConfigSettings, DependencyMetadata, ExtraBuildVariables, HashGeneration, Index, IndexLocations, + NameRequirementSpecification, Origin, PackageConfigSettings, Requirement, RequiresPython, UnresolvedRequirementSpecification, Verbatim, }; use uv_fs::{CWD, Simplified}; diff --git a/crates/uv/src/commands/pip/install.rs b/crates/uv/src/commands/pip/install.rs index ffba49c4c..3809a1585 100644 --- a/crates/uv/src/commands/pip/install.rs +++ b/crates/uv/src/commands/pip/install.rs @@ -9,16 +9,16 @@ use tracing::{Level, debug, enabled, warn}; use uv_cache::Cache; use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder}; use uv_configuration::{ - BuildOptions, Concurrency, ConfigSettings, Constraints, DryRun, ExtrasSpecification, - HashCheckingMode, IndexStrategy, PackageConfigSettings, Preview, PreviewFeatures, Reinstall, - SourceStrategy, Upgrade, + BuildOptions, Concurrency, Constraints, DryRun, ExtrasSpecification, HashCheckingMode, + IndexStrategy, Preview, PreviewFeatures, Reinstall, SourceStrategy, Upgrade, }; use uv_configuration::{KeyringProviderType, TargetTriple}; use uv_dispatch::{BuildDispatch, SharedState}; use uv_distribution::LoweredExtraBuildDependencies; use uv_distribution_types::{ - DependencyMetadata, ExtraBuildVariables, Index, IndexLocations, NameRequirementSpecification, - Origin, Requirement, Resolution, UnresolvedRequirementSpecification, + ConfigSettings, DependencyMetadata, ExtraBuildVariables, Index, IndexLocations, + NameRequirementSpecification, Origin, PackageConfigSettings, Requirement, Resolution, + UnresolvedRequirementSpecification, }; use uv_fs::Simplified; use uv_install_wheel::LinkMode; diff --git a/crates/uv/src/commands/pip/sync.rs b/crates/uv/src/commands/pip/sync.rs index 0a124f00b..29363e72a 100644 --- a/crates/uv/src/commands/pip/sync.rs +++ b/crates/uv/src/commands/pip/sync.rs @@ -8,15 +8,15 @@ use tracing::{debug, warn}; use uv_cache::Cache; use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder}; use uv_configuration::{ - BuildOptions, Concurrency, ConfigSettings, Constraints, DryRun, ExtrasSpecification, - HashCheckingMode, IndexStrategy, PackageConfigSettings, Preview, PreviewFeatures, Reinstall, - SourceStrategy, Upgrade, + BuildOptions, Concurrency, Constraints, DryRun, ExtrasSpecification, HashCheckingMode, + IndexStrategy, Preview, PreviewFeatures, Reinstall, SourceStrategy, Upgrade, }; use uv_configuration::{KeyringProviderType, TargetTriple}; use uv_dispatch::{BuildDispatch, SharedState}; use uv_distribution::LoweredExtraBuildDependencies; use uv_distribution_types::{ - DependencyMetadata, ExtraBuildVariables, Index, IndexLocations, Origin, Resolution, + ConfigSettings, DependencyMetadata, ExtraBuildVariables, Index, IndexLocations, Origin, + PackageConfigSettings, Resolution, }; use uv_fs::Simplified; use uv_install_wheel::LinkMode; diff --git a/crates/uv/src/commands/venv.rs b/crates/uv/src/commands/venv.rs index da6a7acab..f54f3be59 100644 --- a/crates/uv/src/commands/venv.rs +++ b/crates/uv/src/commands/venv.rs @@ -10,13 +10,14 @@ use thiserror::Error; use uv_cache::Cache; use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder}; use uv_configuration::{ - BuildOptions, Concurrency, ConfigSettings, Constraints, DependencyGroups, IndexStrategy, - KeyringProviderType, NoBinary, NoBuild, PackageConfigSettings, Preview, PreviewFeatures, - SourceStrategy, + BuildOptions, Concurrency, Constraints, DependencyGroups, IndexStrategy, KeyringProviderType, + NoBinary, NoBuild, Preview, PreviewFeatures, SourceStrategy, }; use uv_dispatch::{BuildDispatch, SharedState}; -use uv_distribution_types::{DependencyMetadata, Index, IndexLocations}; -use uv_distribution_types::{ExtraBuildRequires, Requirement}; +use uv_distribution_types::{ + ConfigSettings, DependencyMetadata, ExtraBuildRequires, Index, IndexLocations, + PackageConfigSettings, Requirement, +}; use uv_fs::Simplified; use uv_install_wheel::LinkMode; use uv_normalize::DefaultGroups; diff --git a/crates/uv/src/settings.rs b/crates/uv/src/settings.rs index f21ffdbb2..2f1646b76 100644 --- a/crates/uv/src/settings.rs +++ b/crates/uv/src/settings.rs @@ -21,14 +21,14 @@ use uv_cli::{ }; use uv_client::Connectivity; use uv_configuration::{ - BuildOptions, Concurrency, ConfigSettings, DependencyGroups, DryRun, EditableMode, - ExportFormat, ExtrasSpecification, HashCheckingMode, IndexStrategy, InstallOptions, - KeyringProviderType, NoBinary, NoBuild, PackageConfigSettings, Preview, ProjectBuildBackend, - Reinstall, RequiredVersion, SourceStrategy, TargetTriple, TrustedHost, TrustedPublishing, - Upgrade, VersionControlSystem, + BuildOptions, Concurrency, DependencyGroups, DryRun, EditableMode, ExportFormat, + ExtrasSpecification, HashCheckingMode, IndexStrategy, InstallOptions, KeyringProviderType, + NoBinary, NoBuild, Preview, ProjectBuildBackend, Reinstall, RequiredVersion, SourceStrategy, + TargetTriple, TrustedHost, TrustedPublishing, Upgrade, VersionControlSystem, }; use uv_distribution_types::{ - DependencyMetadata, ExtraBuildVariables, Index, IndexLocations, IndexUrl, Requirement, + ConfigSettings, DependencyMetadata, ExtraBuildVariables, Index, IndexLocations, IndexUrl, + PackageConfigSettings, Requirement, }; use uv_install_wheel::LinkMode; use uv_normalize::{PackageName, PipGroupName};