From 33ec6f063d486bbb6cfec44229234de45f96e106 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Mon, 5 Aug 2024 16:32:10 -0400 Subject: [PATCH] Remove interpreter from `BuildContext` trait (#5800) --- crates/uv-dev/src/build.rs | 4 ++-- crates/uv-dispatch/src/lib.rs | 4 ---- crates/uv-types/src/traits.rs | 6 +----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/crates/uv-dev/src/build.rs b/crates/uv-dev/src/build.rs index 51c318650..ab67303f8 100644 --- a/crates/uv-dev/src/build.rs +++ b/crates/uv-dev/src/build.rs @@ -18,7 +18,7 @@ use uv_dispatch::BuildDispatch; use uv_git::GitResolver; use uv_python::{EnvironmentPreference, PythonEnvironment, PythonRequest}; use uv_resolver::{FlatIndex, InMemoryIndex}; -use uv_types::{BuildContext, BuildIsolation, InFlight}; +use uv_types::{BuildIsolation, InFlight}; #[derive(Parser)] pub(crate) struct BuildArgs { @@ -100,7 +100,7 @@ pub(crate) async fn build(args: BuildArgs) -> Result { let builder = SourceBuild::setup( &args.sdist, args.subdirectory.as_deref(), - build_dispatch.interpreter(), + python.interpreter(), &build_dispatch, SourceBuildContext::default(), args.sdist.display().to_string(), diff --git a/crates/uv-dispatch/src/lib.rs b/crates/uv-dispatch/src/lib.rs index 06c86d00a..f59f11412 100644 --- a/crates/uv-dispatch/src/lib.rs +++ b/crates/uv-dispatch/src/lib.rs @@ -127,10 +127,6 @@ impl<'a> BuildContext for BuildDispatch<'a> { self.git } - fn interpreter(&self) -> &Interpreter { - self.interpreter - } - fn build_options(&self) -> &BuildOptions { self.build_options } diff --git a/crates/uv-types/src/traits.rs b/crates/uv-types/src/traits.rs index bac9cb05c..d0710af30 100644 --- a/crates/uv-types/src/traits.rs +++ b/crates/uv-types/src/traits.rs @@ -9,7 +9,7 @@ use pypi_types::Requirement; use uv_cache::Cache; use uv_configuration::{BuildKind, BuildOptions}; use uv_git::GitResolver; -use uv_python::{Interpreter, PythonEnvironment}; +use uv_python::PythonEnvironment; /// Avoids cyclic crate dependencies between resolver, installer and builder. /// @@ -57,10 +57,6 @@ pub trait BuildContext { /// Return a reference to the Git resolver. fn git(&self) -> &GitResolver; - /// All (potentially nested) source distribution builds use the same base python and can reuse - /// it's metadata (e.g. wheel compatibility tags). - fn interpreter(&self) -> &Interpreter; - /// Whether source distribution building or pre-built wheels is disabled. /// /// This [`BuildContext::setup_build`] calls will fail if builds are disabled.