mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-14 09:45:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove interpreter from BuildContext trait (#5800)

Browse source
This commit is contained in:
Charlie Marsh 2024-08-05 16:32:10 -04:00 • committed by GitHub
parent 92a2996e8e
commit 33ec6f063d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@ use uv_dispatch::BuildDispatch;
use uv_git::GitResolver; use uv_git::GitResolver;
use uv_python::{EnvironmentPreference, PythonEnvironment, PythonRequest}; use uv_python::{EnvironmentPreference, PythonEnvironment, PythonRequest};
use uv_resolver::{FlatIndex, InMemoryIndex}; use uv_resolver::{FlatIndex, InMemoryIndex};
use uv_types::{BuildContext, BuildIsolation, InFlight}; use uv_types::{BuildIsolation, InFlight};
#[derive(Parser)] #[derive(Parser)]
pub(crate) struct BuildArgs { pub(crate) struct BuildArgs {
@ -100,7 +100,7 @@ pub(crate) async fn build(args: BuildArgs) -> Result<PathBuf> {
let builder = SourceBuild::setup( let builder = SourceBuild::setup(
&args.sdist, &args.sdist,
args.subdirectory.as_deref(), args.subdirectory.as_deref(),
build_dispatch.interpreter(), python.interpreter(),
&build_dispatch, &build_dispatch,
SourceBuildContext::default(), SourceBuildContext::default(),
args.sdist.display().to_string(), args.sdist.display().to_string(),

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

@ -127,10 +127,6 @@ impl<'a> BuildContext for BuildDispatch<'a> {
self.git self.git
} }
fn interpreter(&self) -> &Interpreter {
self.interpreter
}
fn build_options(&self) -> &BuildOptions { fn build_options(&self) -> &BuildOptions {
self.build_options self.build_options
} }

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

@ -9,7 +9,7 @@ use pypi_types::Requirement;
use uv_cache::Cache; use uv_cache::Cache;
use uv_configuration::{BuildKind, BuildOptions}; use uv_configuration::{BuildKind, BuildOptions};
use uv_git::GitResolver; use uv_git::GitResolver;
use uv_python::{Interpreter, PythonEnvironment}; use uv_python::PythonEnvironment;
/// Avoids cyclic crate dependencies between resolver, installer and builder. /// Avoids cyclic crate dependencies between resolver, installer and builder.
/// ///
@ -57,10 +57,6 @@ pub trait BuildContext {
/// Return a reference to the Git resolver. /// Return a reference to the Git resolver.
fn git(&self) -> &GitResolver; 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. /// Whether source distribution building or pre-built wheels is disabled.
/// ///
/// This [`BuildContext::setup_build`] calls will fail if builds are disabled. /// This [`BuildContext::setup_build`] calls will fail if builds are disabled.