mirror of
https://github.com/astral-sh/uv.git
synced 2025-08-04 10:58:28 +00:00

> NOTE: The PRs that were merged into this feature branch have all been independently reviewed. But it's also useful to see all of the changes in their final form. I've added comments to significant changes throughout the PR to aid discussion. This PR introduces transparent Python version upgrades to uv, allowing for a smoother experience when upgrading to new patch versions. Previously, upgrading Python patch versions required manual updates to each virtual environment. Now, virtual environments can transparently upgrade to newer patch versions. Due to significant changes in how uv installs and executes managed Python executables, this functionality is initially available behind a `--preview` flag. Once an installation has been made upgradeable through `--preview`, subsequent operations (like `uv venv -p 3.10` or patch upgrades) will work without requiring the flag again. This is accomplished by checking for the existence of a minor version symlink directory (or junction on Windows). ### Features * New `uv python upgrade` command to upgrade installed Python versions to the latest available patch release: ``` # Upgrade specific minor version uv python upgrade 3.12 --preview # Upgrade all installed minor versions uv python upgrade --preview ``` * Transparent upgrades also occur when installing newer patch versions: ``` uv python install 3.10.8 --preview # Automatically upgrades existing 3.10 environments uv python install 3.10.18 ``` * Support for transparently upgradeable Python `bin` installations via `--preview` flag ``` uv python install 3.13 --preview # Automatically upgrades the `bin` installation if there is a newer patch version available uv python upgrade 3.13 --preview ``` * Virtual environments can still be tied to a patch version if desired (ignoring patch upgrades): ``` uv venv -p 3.10.8 ``` ### Implementation Transparent upgrades are implemented using: * Minor version symlink directories (Unix) or junctions (Windows) * On Windows, trampolines simulate paths with junctions * Symlink directory naming follows Python build standalone format: e.g., `cpython-3.10-macos-aarch64-none` * Upgrades are scoped to the minor version key (as represented in the naming format: implementation-minor version+variant-os-arch-libc) * If the context does not provide a patch version request and the interpreter is from a managed CPython installation, the `Interpreter` used by `uv python run` will use the full symlink directory executable path when available, enabling transparently upgradeable environments created with the `venv` module (`uv run python -m venv`) New types: * `PythonMinorVersionLink`: in a sense, the core type for this PR, this is a representation of a minor version symlink directory (or junction on Windows) that points to the highest installed managed CPython patch version for a minor version key. * `PythonInstallationMinorVersionKey`: provides a view into a `PythonInstallationKey` that excludes the patch and prerelease. This is used for grouping installations by minor version key (e.g., to find the highest available patch installation for that minor version key) and for minor version directory naming. ### Compatibility * Supports virtual environments created with: * `uv venv` * `uv run python -m venv` (using managed Python that was installed or upgraded with `--preview`) * Virtual environments created within these environments * Existing virtual environments from before these changes continue to work but aren't transparently upgradeable without being recreated * Supports both standard Python (`python3.10`) and freethreaded Python (`python3.10t`) * Support for transparently upgrades is currently only available for managed CPython installations Closes #7287 Closes #7325 Closes #7892 Closes #9031 Closes #12977 --------- Co-authored-by: Zanie Blue <contact@zanie.dev>
559 lines
18 KiB
Rust
559 lines
18 KiB
Rust
//! Avoid cyclic crate dependencies between [resolver][`uv_resolver`],
|
|
//! [installer][`uv_installer`] and [build][`uv_build`] through [`BuildDispatch`]
|
|
//! implementing [`BuildContext`].
|
|
|
|
use std::ffi::{OsStr, OsString};
|
|
use std::path::Path;
|
|
|
|
use anyhow::{Context, Result};
|
|
use futures::FutureExt;
|
|
use itertools::Itertools;
|
|
use rustc_hash::FxHashMap;
|
|
use thiserror::Error;
|
|
use tracing::{debug, instrument, trace};
|
|
use uv_build_backend::check_direct_build;
|
|
use uv_build_frontend::{SourceBuild, SourceBuildContext};
|
|
use uv_cache::Cache;
|
|
use uv_client::RegistryClient;
|
|
use uv_configuration::{
|
|
BuildKind, BuildOptions, ConfigSettings, Constraints, IndexStrategy, PreviewMode, Reinstall,
|
|
SourceStrategy,
|
|
};
|
|
use uv_configuration::{BuildOutput, Concurrency};
|
|
use uv_distribution::DistributionDatabase;
|
|
use uv_distribution_filename::DistFilename;
|
|
use uv_distribution_types::{
|
|
CachedDist, DependencyMetadata, Identifier, IndexCapabilities, IndexLocations,
|
|
IsBuildBackendError, Name, Requirement, Resolution, SourceDist, VersionOrUrlRef,
|
|
};
|
|
use uv_git::GitResolver;
|
|
use uv_installer::{Installer, Plan, Planner, Preparer, SitePackages};
|
|
use uv_pypi_types::Conflicts;
|
|
use uv_python::{Interpreter, PythonEnvironment};
|
|
use uv_resolver::{
|
|
ExcludeNewer, FlatIndex, Flexibility, InMemoryIndex, Manifest, OptionsBuilder,
|
|
PythonRequirement, Resolver, ResolverEnvironment,
|
|
};
|
|
use uv_types::{
|
|
AnyErrorBuild, BuildContext, BuildIsolation, BuildStack, EmptyInstalledPackages, HashStrategy,
|
|
InFlight,
|
|
};
|
|
use uv_workspace::WorkspaceCache;
|
|
|
|
#[derive(Debug, Error)]
|
|
pub enum BuildDispatchError {
|
|
#[error(transparent)]
|
|
BuildFrontend(#[from] AnyErrorBuild),
|
|
|
|
#[error(transparent)]
|
|
Tags(#[from] uv_platform_tags::TagsError),
|
|
|
|
#[error(transparent)]
|
|
Resolve(#[from] uv_resolver::ResolveError),
|
|
|
|
#[error(transparent)]
|
|
Join(#[from] tokio::task::JoinError),
|
|
|
|
#[error(transparent)]
|
|
Anyhow(#[from] anyhow::Error),
|
|
|
|
#[error(transparent)]
|
|
Prepare(#[from] uv_installer::PrepareError),
|
|
}
|
|
|
|
impl IsBuildBackendError for BuildDispatchError {
|
|
fn is_build_backend_error(&self) -> bool {
|
|
match self {
|
|
BuildDispatchError::Tags(_)
|
|
| BuildDispatchError::Resolve(_)
|
|
| BuildDispatchError::Join(_)
|
|
| BuildDispatchError::Anyhow(_)
|
|
| BuildDispatchError::Prepare(_) => false,
|
|
BuildDispatchError::BuildFrontend(err) => err.is_build_backend_error(),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// The main implementation of [`BuildContext`], used by the CLI, see [`BuildContext`]
|
|
/// documentation.
|
|
pub struct BuildDispatch<'a> {
|
|
client: &'a RegistryClient,
|
|
cache: &'a Cache,
|
|
constraints: Constraints,
|
|
interpreter: &'a Interpreter,
|
|
index_locations: &'a IndexLocations,
|
|
index_strategy: IndexStrategy,
|
|
flat_index: &'a FlatIndex,
|
|
shared_state: SharedState,
|
|
dependency_metadata: &'a DependencyMetadata,
|
|
build_isolation: BuildIsolation<'a>,
|
|
link_mode: uv_install_wheel::LinkMode,
|
|
build_options: &'a BuildOptions,
|
|
config_settings: &'a ConfigSettings,
|
|
hasher: &'a HashStrategy,
|
|
exclude_newer: Option<ExcludeNewer>,
|
|
source_build_context: SourceBuildContext,
|
|
build_extra_env_vars: FxHashMap<OsString, OsString>,
|
|
sources: SourceStrategy,
|
|
workspace_cache: WorkspaceCache,
|
|
concurrency: Concurrency,
|
|
preview: PreviewMode,
|
|
}
|
|
|
|
impl<'a> BuildDispatch<'a> {
|
|
pub fn new(
|
|
client: &'a RegistryClient,
|
|
cache: &'a Cache,
|
|
constraints: Constraints,
|
|
interpreter: &'a Interpreter,
|
|
index_locations: &'a IndexLocations,
|
|
flat_index: &'a FlatIndex,
|
|
dependency_metadata: &'a DependencyMetadata,
|
|
shared_state: SharedState,
|
|
index_strategy: IndexStrategy,
|
|
config_settings: &'a ConfigSettings,
|
|
build_isolation: BuildIsolation<'a>,
|
|
link_mode: uv_install_wheel::LinkMode,
|
|
build_options: &'a BuildOptions,
|
|
hasher: &'a HashStrategy,
|
|
exclude_newer: Option<ExcludeNewer>,
|
|
sources: SourceStrategy,
|
|
workspace_cache: WorkspaceCache,
|
|
concurrency: Concurrency,
|
|
preview: PreviewMode,
|
|
) -> Self {
|
|
Self {
|
|
client,
|
|
cache,
|
|
constraints,
|
|
interpreter,
|
|
index_locations,
|
|
flat_index,
|
|
shared_state,
|
|
dependency_metadata,
|
|
index_strategy,
|
|
config_settings,
|
|
build_isolation,
|
|
link_mode,
|
|
build_options,
|
|
hasher,
|
|
exclude_newer,
|
|
source_build_context: SourceBuildContext::default(),
|
|
build_extra_env_vars: FxHashMap::default(),
|
|
sources,
|
|
workspace_cache,
|
|
concurrency,
|
|
preview,
|
|
}
|
|
}
|
|
|
|
/// Set the environment variables to be used when building a source distribution.
|
|
#[must_use]
|
|
pub fn with_build_extra_env_vars<I, K, V>(mut self, sdist_build_env_variables: I) -> Self
|
|
where
|
|
I: IntoIterator<Item = (K, V)>,
|
|
K: AsRef<OsStr>,
|
|
V: AsRef<OsStr>,
|
|
{
|
|
self.build_extra_env_vars = sdist_build_env_variables
|
|
.into_iter()
|
|
.map(|(key, value)| (key.as_ref().to_owned(), value.as_ref().to_owned()))
|
|
.collect();
|
|
self
|
|
}
|
|
}
|
|
|
|
#[allow(refining_impl_trait)]
|
|
impl BuildContext for BuildDispatch<'_> {
|
|
type SourceDistBuilder = SourceBuild;
|
|
|
|
fn interpreter(&self) -> &Interpreter {
|
|
self.interpreter
|
|
}
|
|
|
|
fn cache(&self) -> &Cache {
|
|
self.cache
|
|
}
|
|
|
|
fn git(&self) -> &GitResolver {
|
|
&self.shared_state.git
|
|
}
|
|
|
|
fn capabilities(&self) -> &IndexCapabilities {
|
|
&self.shared_state.capabilities
|
|
}
|
|
|
|
fn dependency_metadata(&self) -> &DependencyMetadata {
|
|
self.dependency_metadata
|
|
}
|
|
|
|
fn build_options(&self) -> &BuildOptions {
|
|
self.build_options
|
|
}
|
|
|
|
fn config_settings(&self) -> &ConfigSettings {
|
|
self.config_settings
|
|
}
|
|
|
|
fn sources(&self) -> SourceStrategy {
|
|
self.sources
|
|
}
|
|
|
|
fn locations(&self) -> &IndexLocations {
|
|
self.index_locations
|
|
}
|
|
|
|
fn workspace_cache(&self) -> &WorkspaceCache {
|
|
&self.workspace_cache
|
|
}
|
|
|
|
async fn resolve<'data>(
|
|
&'data self,
|
|
requirements: &'data [Requirement],
|
|
build_stack: &'data BuildStack,
|
|
) -> Result<Resolution, BuildDispatchError> {
|
|
let python_requirement = PythonRequirement::from_interpreter(self.interpreter);
|
|
let marker_env = self.interpreter.resolver_marker_environment();
|
|
let tags = self.interpreter.tags()?;
|
|
|
|
let resolver = Resolver::new(
|
|
Manifest::simple(requirements.to_vec()).with_constraints(self.constraints.clone()),
|
|
OptionsBuilder::new()
|
|
.exclude_newer(self.exclude_newer)
|
|
.index_strategy(self.index_strategy)
|
|
.build_options(self.build_options.clone())
|
|
.flexibility(Flexibility::Fixed)
|
|
.build(),
|
|
&python_requirement,
|
|
ResolverEnvironment::specific(marker_env),
|
|
self.interpreter.markers(),
|
|
// Conflicting groups only make sense when doing universal resolution.
|
|
Conflicts::empty(),
|
|
Some(tags),
|
|
self.flat_index,
|
|
&self.shared_state.index,
|
|
self.hasher,
|
|
self,
|
|
EmptyInstalledPackages,
|
|
DistributionDatabase::new(self.client, self, self.concurrency.downloads)
|
|
.with_build_stack(build_stack),
|
|
)?;
|
|
let resolution = Resolution::from(resolver.resolve().await.with_context(|| {
|
|
format!(
|
|
"No solution found when resolving: {}",
|
|
requirements
|
|
.iter()
|
|
.map(|requirement| format!("`{requirement}`"))
|
|
.join(", ")
|
|
)
|
|
})?);
|
|
Ok(resolution)
|
|
}
|
|
|
|
#[instrument(
|
|
skip(self, resolution, venv),
|
|
fields(
|
|
resolution = resolution.distributions().map(ToString::to_string).join(", "),
|
|
venv = ?venv.root()
|
|
)
|
|
)]
|
|
async fn install<'data>(
|
|
&'data self,
|
|
resolution: &'data Resolution,
|
|
venv: &'data PythonEnvironment,
|
|
build_stack: &'data BuildStack,
|
|
) -> Result<Vec<CachedDist>, BuildDispatchError> {
|
|
debug!(
|
|
"Installing in {} in {}",
|
|
resolution
|
|
.distributions()
|
|
.map(ToString::to_string)
|
|
.join(", "),
|
|
venv.root().display(),
|
|
);
|
|
|
|
// Determine the current environment markers.
|
|
let tags = self.interpreter.tags()?;
|
|
|
|
// Determine the set of installed packages.
|
|
let site_packages = SitePackages::from_environment(venv)?;
|
|
|
|
let Plan {
|
|
cached,
|
|
remote,
|
|
reinstalls,
|
|
extraneous: _,
|
|
} = Planner::new(resolution).build(
|
|
site_packages,
|
|
&Reinstall::default(),
|
|
self.build_options,
|
|
self.hasher,
|
|
self.index_locations,
|
|
self.config_settings,
|
|
self.cache(),
|
|
venv,
|
|
tags,
|
|
)?;
|
|
|
|
// Nothing to do.
|
|
if remote.is_empty() && cached.is_empty() && reinstalls.is_empty() {
|
|
debug!("No build requirements to install for build");
|
|
return Ok(vec![]);
|
|
}
|
|
|
|
// Verify that none of the missing distributions are already in the build stack.
|
|
for dist in &remote {
|
|
let id = dist.distribution_id();
|
|
if build_stack.contains(&id) {
|
|
return Err(BuildDispatchError::BuildFrontend(
|
|
uv_build_frontend::Error::CyclicBuildDependency(dist.name().clone()).into(),
|
|
));
|
|
}
|
|
}
|
|
|
|
// Download any missing distributions.
|
|
let wheels = if remote.is_empty() {
|
|
vec![]
|
|
} else {
|
|
let preparer = Preparer::new(
|
|
self.cache,
|
|
tags,
|
|
self.hasher,
|
|
self.build_options,
|
|
DistributionDatabase::new(self.client, self, self.concurrency.downloads)
|
|
.with_build_stack(build_stack),
|
|
);
|
|
|
|
debug!(
|
|
"Downloading and building requirement{} for build: {}",
|
|
if remote.len() == 1 { "" } else { "s" },
|
|
remote.iter().map(ToString::to_string).join(", ")
|
|
);
|
|
|
|
preparer
|
|
.prepare(remote, &self.shared_state.in_flight, resolution)
|
|
.await?
|
|
};
|
|
|
|
// Remove any unnecessary packages.
|
|
if !reinstalls.is_empty() {
|
|
for dist_info in &reinstalls {
|
|
let summary = uv_installer::uninstall(dist_info)
|
|
.await
|
|
.context("Failed to uninstall build dependencies")?;
|
|
debug!(
|
|
"Uninstalled {} ({} file{}, {} director{})",
|
|
dist_info.name(),
|
|
summary.file_count,
|
|
if summary.file_count == 1 { "" } else { "s" },
|
|
summary.dir_count,
|
|
if summary.dir_count == 1 { "y" } else { "ies" },
|
|
);
|
|
}
|
|
}
|
|
|
|
// Install the resolved distributions.
|
|
let mut wheels = wheels.into_iter().chain(cached).collect::<Vec<_>>();
|
|
if !wheels.is_empty() {
|
|
debug!(
|
|
"Installing build requirement{}: {}",
|
|
if wheels.len() == 1 { "" } else { "s" },
|
|
wheels.iter().map(ToString::to_string).join(", ")
|
|
);
|
|
wheels = Installer::new(venv)
|
|
.with_link_mode(self.link_mode)
|
|
.with_cache(self.cache)
|
|
.install(wheels)
|
|
.await
|
|
.context("Failed to install build dependencies")?;
|
|
}
|
|
|
|
Ok(wheels)
|
|
}
|
|
|
|
#[instrument(skip_all, fields(version_id = version_id, subdirectory = ?subdirectory))]
|
|
async fn setup_build<'data>(
|
|
&'data self,
|
|
source: &'data Path,
|
|
subdirectory: Option<&'data Path>,
|
|
install_path: &'data Path,
|
|
version_id: Option<&'data str>,
|
|
dist: Option<&'data SourceDist>,
|
|
sources: SourceStrategy,
|
|
build_kind: BuildKind,
|
|
build_output: BuildOutput,
|
|
mut build_stack: BuildStack,
|
|
) -> Result<SourceBuild, uv_build_frontend::Error> {
|
|
let dist_name = dist.map(uv_distribution_types::Name::name);
|
|
let dist_version = dist
|
|
.map(uv_distribution_types::DistributionMetadata::version_or_url)
|
|
.and_then(|version| match version {
|
|
VersionOrUrlRef::Version(version) => Some(version),
|
|
VersionOrUrlRef::Url(_) => None,
|
|
});
|
|
|
|
// Note we can only prevent builds by name for packages with names
|
|
// unless all builds are disabled.
|
|
if self
|
|
.build_options
|
|
.no_build_requirement(dist_name)
|
|
// We always allow editable builds
|
|
&& !matches!(build_kind, BuildKind::Editable)
|
|
{
|
|
let err = if let Some(dist) = dist {
|
|
uv_build_frontend::Error::NoSourceDistBuild(dist.name().clone())
|
|
} else {
|
|
uv_build_frontend::Error::NoSourceDistBuilds
|
|
};
|
|
return Err(err);
|
|
}
|
|
|
|
// Push the current distribution onto the build stack, to prevent cyclic dependencies.
|
|
if let Some(dist) = dist {
|
|
build_stack.insert(dist.distribution_id());
|
|
}
|
|
|
|
let builder = SourceBuild::setup(
|
|
source,
|
|
subdirectory,
|
|
install_path,
|
|
dist_name,
|
|
dist_version,
|
|
self.interpreter,
|
|
self,
|
|
self.source_build_context.clone(),
|
|
version_id,
|
|
self.index_locations,
|
|
sources,
|
|
self.workspace_cache(),
|
|
self.config_settings.clone(),
|
|
self.build_isolation,
|
|
&build_stack,
|
|
build_kind,
|
|
self.build_extra_env_vars.clone(),
|
|
build_output,
|
|
self.concurrency.builds,
|
|
self.preview,
|
|
)
|
|
.boxed_local()
|
|
.await?;
|
|
Ok(builder)
|
|
}
|
|
|
|
async fn direct_build<'data>(
|
|
&'data self,
|
|
source: &'data Path,
|
|
subdirectory: Option<&'data Path>,
|
|
output_dir: &'data Path,
|
|
build_kind: BuildKind,
|
|
version_id: Option<&'data str>,
|
|
) -> Result<Option<DistFilename>, BuildDispatchError> {
|
|
// Direct builds are a preview feature with the uv build backend.
|
|
if self.preview.is_disabled() {
|
|
trace!("Preview is disabled, not checking for direct build");
|
|
return Ok(None);
|
|
}
|
|
|
|
let source_tree = if let Some(subdir) = subdirectory {
|
|
source.join(subdir)
|
|
} else {
|
|
source.to_path_buf()
|
|
};
|
|
|
|
// Only perform the direct build if the backend is uv in a compatible version.
|
|
let source_tree_str = source_tree.display().to_string();
|
|
let identifier = version_id.unwrap_or_else(|| &source_tree_str);
|
|
if !check_direct_build(&source_tree, identifier) {
|
|
trace!("Requirements for direct build not matched: {identifier}");
|
|
return Ok(None);
|
|
}
|
|
|
|
debug!("Performing direct build for {identifier}");
|
|
|
|
let output_dir = output_dir.to_path_buf();
|
|
let filename = tokio::task::spawn_blocking(move || -> Result<_> {
|
|
let filename = match build_kind {
|
|
BuildKind::Wheel => {
|
|
let wheel = uv_build_backend::build_wheel(
|
|
&source_tree,
|
|
&output_dir,
|
|
None,
|
|
uv_version::version(),
|
|
)?;
|
|
DistFilename::WheelFilename(wheel)
|
|
}
|
|
BuildKind::Sdist => {
|
|
let source_dist = uv_build_backend::build_source_dist(
|
|
&source_tree,
|
|
&output_dir,
|
|
uv_version::version(),
|
|
)?;
|
|
DistFilename::SourceDistFilename(source_dist)
|
|
}
|
|
BuildKind::Editable => {
|
|
let wheel = uv_build_backend::build_editable(
|
|
&source_tree,
|
|
&output_dir,
|
|
None,
|
|
uv_version::version(),
|
|
)?;
|
|
DistFilename::WheelFilename(wheel)
|
|
}
|
|
};
|
|
Ok(filename)
|
|
})
|
|
.await??;
|
|
|
|
Ok(Some(filename))
|
|
}
|
|
}
|
|
|
|
/// Shared state used during resolution and installation.
|
|
///
|
|
/// All elements are `Arc`s, so we can clone freely.
|
|
#[derive(Default, Clone)]
|
|
pub struct SharedState {
|
|
/// The resolved Git references.
|
|
git: GitResolver,
|
|
/// The discovered capabilities for each registry index.
|
|
capabilities: IndexCapabilities,
|
|
/// The fetched package versions and metadata.
|
|
index: InMemoryIndex,
|
|
/// The downloaded distributions.
|
|
in_flight: InFlight,
|
|
}
|
|
|
|
impl SharedState {
|
|
/// Fork the [`SharedState`], creating a new in-memory index and in-flight cache.
|
|
///
|
|
/// State that is universally applicable (like the Git resolver and index capabilities)
|
|
/// are retained.
|
|
#[must_use]
|
|
pub fn fork(&self) -> Self {
|
|
Self {
|
|
git: self.git.clone(),
|
|
capabilities: self.capabilities.clone(),
|
|
..Default::default()
|
|
}
|
|
}
|
|
|
|
/// Return the [`GitResolver`] used by the [`SharedState`].
|
|
pub fn git(&self) -> &GitResolver {
|
|
&self.git
|
|
}
|
|
|
|
/// Return the [`InMemoryIndex`] used by the [`SharedState`].
|
|
pub fn index(&self) -> &InMemoryIndex {
|
|
&self.index
|
|
}
|
|
|
|
/// Return the [`InFlight`] used by the [`SharedState`].
|
|
pub fn in_flight(&self) -> &InFlight {
|
|
&self.in_flight
|
|
}
|
|
|
|
/// Return the [`IndexCapabilities`] used by the [`SharedState`].
|
|
pub fn capabilities(&self) -> &IndexCapabilities {
|
|
&self.capabilities
|
|
}
|
|
}
|