Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add conversion to fill default settings (#5933) 

## Summary

This paves the way for some future work around the installer receipt. No
behavior changes intended.
This commit is contained in:
Charlie Marsh 2024-08-08 17:05:38 -04:00 committed by GitHub
parent 88ece8b791
commit a5ccc3288c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 146 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
crates/uv-settings/src/settings.rs
View File

@ -157,7 +157,7 @@ pub struct GlobalOptions {
/// Settings relevant to all installer operations.
#[allow(dead_code)]
#[derive(Debug, Clone, Default, Deserialize)]
#[derive(Debug, Clone, Default, Deserialize, CombineOptions)]
#[serde(rename_all = "kebab-case")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct InstallerOptions {
@ -183,7 +183,7 @@ pub struct InstallerOptions {
/// Settings relevant to all resolver operations.
#[allow(dead_code)]
#[derive(Debug, Clone, Default, Deserialize)]
#[derive(Debug, Clone, Default, Deserialize, CombineOptions)]
#[serde(rename_all = "kebab-case")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct ResolverOptions {
@ -1191,3 +1191,55 @@ pub struct PipOptions {
)]
pub concurrent_installs: Option<NonZeroUsize>,
}
impl From<ResolverInstallerOptions> for ResolverOptions {
fn from(value: ResolverInstallerOptions) -> Self {
Self {
index_url: value.index_url,
extra_index_url: value.extra_index_url,
no_index: value.no_index,
find_links: value.find_links,
index_strategy: value.index_strategy,
keyring_provider: value.keyring_provider,
resolution: value.resolution,
prerelease: value.prerelease,
config_settings: value.config_settings,
exclude_newer: value.exclude_newer,
link_mode: value.link_mode,
upgrade: value.upgrade,
upgrade_package: value.upgrade_package,
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_build_isolation_package: value.no_build_isolation_package,
no_sources: value.no_sources,
}
}
}
impl From<ResolverInstallerOptions> for InstallerOptions {
fn from(value: ResolverInstallerOptions) -> Self {
Self {
index_url: value.index_url,
extra_index_url: value.extra_index_url,
no_index: value.no_index,
find_links: value.find_links,
index_strategy: value.index_strategy,
keyring_provider: value.keyring_provider,
config_settings: value.config_settings,
exclude_newer: value.exclude_newer,
link_mode: value.link_mode,
compile_bytecode: value.compile_bytecode,
reinstall: value.reinstall,
reinstall_package: value.reinstall_package,
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,
}
}
}

279
crates/uv/src/settings.rs
View File

@ -1598,95 +1598,14 @@ pub(crate) struct ResolverSettingsRef<'a> {
impl ResolverSettings {
/// Resolve the [`ResolverSettings`] from the CLI and filesystem configuration.
pub(crate) fn combine(args: ResolverOptions, filesystem: Option<FilesystemOptions>) -> Self {
let ResolverInstallerOptions {
index_url,
extra_index_url,
no_index,
find_links,
index_strategy,
keyring_provider,
resolution,
prerelease,
config_settings,
no_build_isolation,
no_build_isolation_package,
exclude_newer,
link_mode,
compile_bytecode: _,
no_sources,
upgrade,
upgrade_package,
reinstall: _,
reinstall_package: _,
no_build,
no_build_package,
no_binary,
no_binary_package,
} = filesystem
.map(FilesystemOptions::into_options)
.map(|options| options.top_level)
.unwrap_or_default();
let options = args.combine(ResolverOptions::from(
filesystem
.map(FilesystemOptions::into_options)
.map(|options| options.top_level)
.unwrap_or_default(),
));
Self {
index_locations: IndexLocations::new(
args.index_url.combine(index_url),
args.extra_index_url
.combine(extra_index_url)
.unwrap_or_default(),
args.find_links.combine(find_links).unwrap_or_default(),
args.no_index.combine(no_index).unwrap_or_default(),
),
resolution: args.resolution.combine(resolution).unwrap_or_default(),
prerelease: args.prerelease.combine(prerelease).unwrap_or_default(),
index_strategy: args
.index_strategy
.combine(index_strategy)
.unwrap_or_default(),
keyring_provider: args
.keyring_provider
.combine(keyring_provider)
.unwrap_or_default(),
config_setting: args
.config_settings
.combine(config_settings)
.unwrap_or_default(),
no_build_isolation: args
.no_build_isolation
.combine(no_build_isolation)
.unwrap_or_default(),
no_build_isolation_package: args
.no_build_isolation_package
.combine(no_build_isolation_package)
.unwrap_or_default(),
exclude_newer: args.exclude_newer.combine(exclude_newer),
link_mode: args.link_mode.combine(link_mode).unwrap_or_default(),
upgrade: Upgrade::from_args(
args.upgrade.combine(upgrade),
args.upgrade_package
.combine(upgrade_package)
.into_iter()
.flatten()
.map(Requirement::from)
.collect(),
),
build_options: BuildOptions::new(
NoBinary::from_args(
args.no_binary.combine(no_binary),
args.no_binary_package
.combine(no_binary_package)
.unwrap_or_default(),
),
NoBuild::from_args(
args.no_build.combine(no_build),
args.no_build_package
.combine(no_build_package)
.unwrap_or_default(),
),
),
sources: SourceStrategy::from_args(
args.no_sources.combine(no_sources).unwrap_or_default(),
),
}
Self::from(options)
}
pub(crate) fn as_ref(&self) -> ResolverSettingsRef {
@ -1708,6 +1627,42 @@ impl ResolverSettings {
}
}
impl From<ResolverOptions> for ResolverSettings {
fn from(value: ResolverOptions) -> Self {
Self {
index_locations: IndexLocations::new(
value.index_url,
value.extra_index_url.unwrap_or_default(),
value.find_links.unwrap_or_default(),
value.no_index.unwrap_or_default(),
),
resolution: value.resolution.unwrap_or_default(),
prerelease: value.prerelease.unwrap_or_default(),
index_strategy: value.index_strategy.unwrap_or_default(),
keyring_provider: value.keyring_provider.unwrap_or_default(),
config_setting: value.config_settings.unwrap_or_default(),
no_build_isolation: value.no_build_isolation.unwrap_or_default(),
no_build_isolation_package: value.no_build_isolation_package.unwrap_or_default(),
exclude_newer: value.exclude_newer,
link_mode: value.link_mode.unwrap_or_default(),
sources: SourceStrategy::from_args(value.no_sources.unwrap_or_default()),
upgrade: Upgrade::from_args(
value.upgrade,
value
.upgrade_package
.into_iter()
.flatten()
.map(Requirement::from)
.collect(),
),
build_options: BuildOptions::new(
NoBinary::from_args(value.no_binary, value.no_binary_package.unwrap_or_default()),
NoBuild::from_args(value.no_build, value.no_build_package.unwrap_or_default()),
),
}
}
}
/// The resolved settings to use for an invocation of the uv CLI with both resolver and installer
/// capabilities.
///
@ -1753,110 +1708,19 @@ pub(crate) struct ResolverInstallerSettingsRef<'a> {
}
impl ResolverInstallerSettings {
/// Resolve the [`ResolverInstallerSettings`] from the CLI and filesystem configuration.
/// Reconcile the [`ResolverInstallerSettings`] from the CLI and filesystem configuration.
pub(crate) fn combine(
args: ResolverInstallerOptions,
filesystem: Option<FilesystemOptions>,
) -> Self {
let ResolverInstallerOptions {
index_url,
extra_index_url,
no_index,
find_links,
index_strategy,
keyring_provider,
resolution,
prerelease,
config_settings,
no_build_isolation,
no_build_isolation_package,
exclude_newer,
link_mode,
compile_bytecode,
no_sources,
upgrade,
upgrade_package,
reinstall,
reinstall_package,
no_build,
no_build_package,
no_binary,
no_binary_package,
} = filesystem
.map(FilesystemOptions::into_options)
.map(|options| options.top_level)
.unwrap_or_default();
let options = args.combine(
filesystem
.map(FilesystemOptions::into_options)
.map(|options| options.top_level)
.unwrap_or_default(),
);
Self {
index_locations: IndexLocations::new(
args.index_url.combine(index_url),
args.extra_index_url
.combine(extra_index_url)
.unwrap_or_default(),
args.find_links.combine(find_links).unwrap_or_default(),
args.no_index.combine(no_index).unwrap_or_default(),
),
resolution: args.resolution.combine(resolution).unwrap_or_default(),
prerelease: args.prerelease.combine(prerelease).unwrap_or_default(),
index_strategy: args
.index_strategy
.combine(index_strategy)
.unwrap_or_default(),
keyring_provider: args
.keyring_provider
.combine(keyring_provider)
.unwrap_or_default(),
config_setting: args
.config_settings
.combine(config_settings)
.unwrap_or_default(),
no_build_isolation: args
.no_build_isolation
.combine(no_build_isolation)
.unwrap_or_default(),
no_build_isolation_package: args
.no_build_isolation_package
.combine(no_build_isolation_package)
.unwrap_or_default(),
exclude_newer: args.exclude_newer.combine(exclude_newer),
link_mode: args.link_mode.combine(link_mode).unwrap_or_default(),
sources: SourceStrategy::from_args(
args.no_sources.combine(no_sources).unwrap_or_default(),
),
compile_bytecode: args
.compile_bytecode
.combine(compile_bytecode)
.unwrap_or_default(),
upgrade: Upgrade::from_args(
args.upgrade.combine(upgrade),
args.upgrade_package
.combine(upgrade_package)
.into_iter()
.flatten()
.map(Requirement::from)
.collect(),
),
reinstall: Reinstall::from_args(
args.reinstall.combine(reinstall),
args.reinstall_package
.combine(reinstall_package)
.unwrap_or_default(),
),
build_options: BuildOptions::new(
NoBinary::from_args(
args.no_binary.combine(no_binary),
args.no_binary_package
.combine(no_binary_package)
.unwrap_or_default(),
),
NoBuild::from_args(
args.no_build.combine(no_build),
args.no_build_package
.combine(no_build_package)
.unwrap_or_default(),
),
),
}
Self::from(options)
}
pub(crate) fn as_ref(&self) -> ResolverInstallerSettingsRef {
@ -1880,6 +1744,47 @@ impl ResolverInstallerSettings {
}
}
impl From<ResolverInstallerOptions> for ResolverInstallerSettings {
fn from(value: ResolverInstallerOptions) -> Self {
Self {
index_locations: IndexLocations::new(
value.index_url,
value.extra_index_url.unwrap_or_default(),
value.find_links.unwrap_or_default(),
value.no_index.unwrap_or_default(),
),
resolution: value.resolution.unwrap_or_default(),
prerelease: value.prerelease.unwrap_or_default(),
index_strategy: value.index_strategy.unwrap_or_default(),
keyring_provider: value.keyring_provider.unwrap_or_default(),
config_setting: value.config_settings.unwrap_or_default(),
no_build_isolation: value.no_build_isolation.unwrap_or_default(),
no_build_isolation_package: value.no_build_isolation_package.unwrap_or_default(),
exclude_newer: value.exclude_newer,
link_mode: value.link_mode.unwrap_or_default(),
sources: SourceStrategy::from_args(value.no_sources.unwrap_or_default()),
compile_bytecode: value.compile_bytecode.unwrap_or_default(),
upgrade: Upgrade::from_args(
value.upgrade,
value
.upgrade_package
.into_iter()
.flatten()
.map(Requirement::from)
.collect(),
),
reinstall: Reinstall::from_args(
value.reinstall,
value.reinstall_package.unwrap_or_default(),
),
build_options: BuildOptions::new(
NoBinary::from_args(value.no_binary, value.no_binary_package.unwrap_or_default()),
NoBuild::from_args(value.no_build, value.no_build_package.unwrap_or_default()),
),
}
}
}
/// The resolved settings to use for an invocation of the `pip` CLI.
///
/// Represents the shared settings that are used across all `pip` commands. Analogous to the