Rename uv-interpreter crate to uv-toolchain

# Conflicts: # crates/uv-resolver/Cargo.toml # crates/uv-resolver/tests/resolver.rs # crates/uv/src/commands/pip/operations.rs # crates/uv/src/commands/venv.rs # Conflicts: # crates/uv-toolchain/src/prefix.rs # crates/uv/src/commands/pip/compile.rs # crates/uv/src/commands/pip/install.rs # crates/uv/src/commands/pip/sync.rs # crates/uv/src/commands/pip/uninstall.rs # crates/uv/src/commands/project/lock.rs # crates/uv/src/settings.rs
astral-sh · Jun 7, 2024 · 1b20055 · 1b20055
1 parent d3651c1
commit 1b20055
Show file tree

Hide file tree

Showing 78 changed files with 119 additions and 117 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,7 +38,7 @@ uv-extract = { path = "crates/uv-extract" }
 uv-fs = { path = "crates/uv-fs" }
 uv-git = { path = "crates/uv-git" }
 uv-installer = { path = "crates/uv-installer" }
-uv-interpreter = { path = "crates/uv-interpreter" }
+uv-toolchain = { path = "crates/uv-toolchain" }
 uv-normalize = { path = "crates/uv-normalize" }
 uv-requirements = { path = "crates/uv-requirements" }
 uv-resolver = { path = "crates/uv-resolver" }

diff --git a/crates/README.md b/crates/README.md
@@ -89,7 +89,7 @@ Functionality for interacting with Git repositories.
 
 Functionality for installing Python packages into a virtual environment.
 
-## [uv-interpreter](./uv-interpreter)
+## [uv-toolchain](./uv-toolchain)
 
 Functionality for detecting and leveraging the current Python interpreter.
 

diff --git a/crates/bench/Cargo.toml b/crates/bench/Cargo.toml
@@ -40,7 +40,7 @@ uv-configuration = { workspace = true }
 uv-dispatch = { workspace = true }
 uv-distribution = { workspace = true }
 uv-git = { workspace = true }
-uv-interpreter = { workspace = true }
+uv-toolchain = { workspace = true }
 uv-resolver = { workspace = true }
 uv-types = { workspace = true }
 

diff --git a/crates/bench/benches/uv.rs b/crates/bench/benches/uv.rs
@@ -5,8 +5,8 @@ use bench::criterion::{criterion_group, criterion_main, measurement::WallTime, C
 use pypi_types::Requirement;
 use uv_cache::Cache;
 use uv_client::RegistryClientBuilder;
-use uv_interpreter::PythonEnvironment;
 use uv_resolver::Manifest;
+use uv_toolchain::PythonEnvironment;
 
 fn resolve_warm_jupyter(c: &mut Criterion<WallTime>) {
     let runtime = &tokio::runtime::Builder::new_current_thread()
@@ -86,10 +86,10 @@ mod resolver {
     use uv_dispatch::BuildDispatch;
     use uv_distribution::DistributionDatabase;
     use uv_git::GitResolver;
-    use uv_interpreter::PythonEnvironment;
     use uv_resolver::{
         FlatIndex, InMemoryIndex, Manifest, Options, PythonRequirement, ResolutionGraph, Resolver,
     };
+    use uv_toolchain::PythonEnvironment;
     use uv_types::{BuildIsolation, EmptyInstalledPackages, HashStrategy, InFlight};
 
     static MARKERS: Lazy<MarkerEnvironment> = Lazy::new(|| {

diff --git a/crates/uv-build/Cargo.toml b/crates/uv-build/Cargo.toml
@@ -19,7 +19,7 @@ pep440_rs = { workspace = true }
 pep508_rs = { workspace = true }
 pypi-types = { workspace = true }
 uv-fs = { workspace = true }
-uv-interpreter = { workspace = true }
+uv-toolchain = { workspace = true }
 uv-types = { workspace = true }
 uv-configuration = { workspace = true }
 uv-virtualenv = { workspace = true }

diff --git a/crates/uv-build/src/lib.rs b/crates/uv-build/src/lib.rs
@@ -31,7 +31,7 @@ use pep508_rs::PackageName;
 use pypi_types::{Requirement, VerbatimParsedUrl};
 use uv_configuration::{BuildKind, ConfigSettings, SetupPyStrategy};
 use uv_fs::{PythonExt, Simplified};
-use uv_interpreter::{Interpreter, PythonEnvironment};
+use uv_toolchain::{Interpreter, PythonEnvironment};
 use uv_types::{BuildContext, BuildIsolation, SourceBuildTrait};
 
 /// e.g. `pygraphviz/graphviz_wrap.c:3020:10: fatal error: graphviz/cgraph.h: No such file or directory`

diff --git a/crates/uv-dev/Cargo.toml b/crates/uv-dev/Cargo.toml
@@ -30,7 +30,7 @@ uv-distribution = { workspace = true, features = ["schemars"] }
 uv-fs = { workspace = true }
 uv-git = { workspace = true }
 uv-installer = { workspace = true }
-uv-interpreter = { workspace = true }
+uv-toolchain = { workspace = true }
 uv-resolver = { workspace = true }
 uv-types = { workspace = true }
 uv-workspace = { workspace = true, features = ["schemars"] }

diff --git a/crates/uv-dev/src/build.rs b/crates/uv-dev/src/build.rs
@@ -15,8 +15,8 @@ use uv_configuration::{
 };
 use uv_dispatch::BuildDispatch;
 use uv_git::GitResolver;
-use uv_interpreter::PythonEnvironment;
 use uv_resolver::{FlatIndex, InMemoryIndex};
+use uv_toolchain::PythonEnvironment;
 use uv_types::{BuildContext, BuildIsolation, InFlight};
 
 #[derive(Parser)]

diff --git a/crates/uv-dev/src/compile.rs b/crates/uv-dev/src/compile.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use clap::Parser;
 use tracing::info;
 use uv_cache::{Cache, CacheArgs};
-use uv_interpreter::PythonEnvironment;
+use uv_toolchain::PythonEnvironment;
 
 #[derive(Parser)]
 pub(crate) struct CompileArgs {

diff --git a/crates/uv-dev/src/fetch_python.rs b/crates/uv-dev/src/fetch_python.rs
@@ -13,8 +13,8 @@ use tokio::time::Instant;
 use tracing::{info, info_span, Instrument};
 
 use uv_fs::Simplified;
-use uv_interpreter::downloads::{DownloadResult, Error, PythonDownload, PythonDownloadRequest};
-use uv_interpreter::managed::InstalledToolchains;
+use uv_toolchain::downloads::{DownloadResult, Error, PythonDownload, PythonDownloadRequest};
+use uv_toolchain::managed::InstalledToolchains;
 
 #[derive(Parser, Debug)]
 pub(crate) struct FetchPythonArgs {

diff --git a/crates/uv-dispatch/Cargo.toml b/crates/uv-dispatch/Cargo.toml
@@ -24,7 +24,7 @@ uv-configuration = { workspace = true }
 uv-distribution = { workspace = true }
 uv-git = { workspace = true }
 uv-installer = { workspace = true }
-uv-interpreter = { workspace = true }
+uv-toolchain = { workspace = true }
 uv-resolver = { workspace = true }
 uv-types = { workspace = true }
 

diff --git a/crates/uv-dispatch/src/lib.rs b/crates/uv-dispatch/src/lib.rs
@@ -21,8 +21,8 @@ use uv_configuration::{Concurrency, PreviewMode};
 use uv_distribution::DistributionDatabase;
 use uv_git::GitResolver;
 use uv_installer::{Downloader, Installer, Plan, Planner, SitePackages};
-use uv_interpreter::{Interpreter, PythonEnvironment};
 use uv_resolver::{FlatIndex, InMemoryIndex, Manifest, Options, PythonRequirement, Resolver};
+use uv_toolchain::{Interpreter, PythonEnvironment};
 use uv_types::{BuildContext, BuildIsolation, EmptyInstalledPackages, HashStrategy, InFlight};
 
 /// The main implementation of [`BuildContext`], used by the CLI, see [`BuildContext`]

diff --git a/crates/uv-installer/Cargo.toml b/crates/uv-installer/Cargo.toml
@@ -27,7 +27,7 @@ uv-distribution = { workspace = true }
 uv-extract = { workspace = true }
 uv-fs = { workspace = true }
 uv-git = { workspace = true }
-uv-interpreter = { workspace = true }
+uv-toolchain = { workspace = true }
 uv-normalize = { workspace = true }
 uv-types = { workspace = true }
 uv-warnings = { workspace = true }

diff --git a/crates/uv-installer/src/installer.rs b/crates/uv-installer/src/installer.rs
@@ -3,7 +3,7 @@ use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use tracing::instrument;
 
 use distribution_types::CachedDist;
-use uv_interpreter::PythonEnvironment;
+use uv_toolchain::PythonEnvironment;
 
 pub struct Installer<'a> {
     venv: &'a PythonEnvironment,

diff --git a/crates/uv-installer/src/plan.rs b/crates/uv-installer/src/plan.rs
@@ -22,7 +22,7 @@ use uv_distribution::{
 };
 use uv_fs::Simplified;
 use uv_git::GitUrl;
-use uv_interpreter::PythonEnvironment;
+use uv_toolchain::PythonEnvironment;
 use uv_types::HashStrategy;
 
 use crate::satisfies::RequirementSatisfaction;

diff --git a/crates/uv-installer/src/site_packages.rs b/crates/uv-installer/src/site_packages.rs
@@ -12,8 +12,8 @@ use distribution_types::{
 };
 use pep440_rs::{Version, VersionSpecifiers};
 use pypi_types::{Requirement, VerbatimParsedUrl};
-use uv_interpreter::PythonEnvironment;
 use uv_normalize::PackageName;
+use uv_toolchain::PythonEnvironment;
 use uv_types::InstalledPackagesProvider;
 
 use crate::satisfies::RequirementSatisfaction;

diff --git a/crates/uv-resolver/Cargo.toml b/crates/uv-resolver/Cargo.toml
@@ -27,7 +27,7 @@ uv-client = { workspace = true }
 uv-configuration = { workspace = true }
 uv-distribution = { workspace = true }
 uv-git = { workspace = true }
-uv-interpreter = { workspace = true }
+uv-toolchain = { workspace = true }
 uv-normalize = { workspace = true }
 uv-types = { workspace = true }
 uv-warnings = { workspace = true }
@@ -58,5 +58,6 @@ tracing = { workspace = true }
 url = { workspace = true }
 
 [dev-dependencies]
+once_cell = { version = "1.19.0" }
 insta = { version = "1.36.1" }
 toml = { workspace = true }
diff --git a/crates/uv-resolver/src/python_requirement.rs b/crates/uv-resolver/src/python_requirement.rs
@@ -1,6 +1,6 @@
 use pep440_rs::VersionSpecifiers;
 use pep508_rs::StringVersion;
-use uv_interpreter::{Interpreter, PythonVersion};
+use uv_toolchain::{Interpreter, PythonVersion};
 
 use crate::RequiresPython;