feat: switch the interpreter to the build options (#136)

Moves the `PythonLocation` to the resolve options, I think it makes more
sense there 👍

crates/rattler_installs_packages/src/artifacts/sdist.rs

@@ -191,7 +191,7 @@ fn generic_archive_reader(
 #[cfg(test)]
 mod tests {
     use crate::artifacts::SDist;
-    use crate::python_env::{Pep508EnvMakers, PythonLocation};
+    use crate::python_env::Pep508EnvMakers;
     use crate::wheel_builder::WheelBuilder;
     use crate::{index::PackageDb, resolve::ResolveOptions};
     use insta::{assert_debug_snapshot, assert_ron_snapshot};
@@ -261,7 +261,6 @@ mod tests {
             None,
             &resolve_options,
             package_db.1.path(),
-            PythonLocation::System,
         );
 
         let result = wheel_builder.get_sdist_metadata(&sdist).await.unwrap();
@@ -285,7 +284,6 @@ mod tests {
             None,
             &resolve_options,
             package_db.1.path(),
-            PythonLocation::System,
         );
 
         // Build the wheel
@@ -311,7 +309,6 @@ mod tests {
             None,
             &resolve_options,
             package_db.1.path(),
-            PythonLocation::System,
         );
 
         // Build the wheel

crates/rattler_installs_packages/src/python_env/venv.rs

@@ -317,7 +317,7 @@ mod tests {
     #[test]
     pub fn venv_creation() {
         let venv_dir = tempfile::tempdir().unwrap();
-        let venv = VEnv::create(&venv_dir.path(), PythonLocation::System).unwrap();
+        let venv = VEnv::create(venv_dir.path(), PythonLocation::System).unwrap();
 
         // Does python exist
         assert!(venv.python_executable().is_file());

crates/rattler_installs_packages/src/resolve/dependency_provider.rs

@@ -2,7 +2,7 @@ use super::SDistResolution;
 use crate::artifacts::SDist;
 use crate::artifacts::Wheel;
 use crate::index::PackageDb;
-use crate::python_env::{PythonLocation, WheelTags};
+use crate::python_env::WheelTags;
 use crate::resolve::{PinnedPackage, ResolveOptions};
 use crate::types::{
     Artifact, ArtifactInfo, ArtifactName, Extra, NormalizedPackageName, PackageName,
@@ -140,15 +140,13 @@ impl<'db, 'i> PypiDependencyProvider<'db, 'i> {
         locked_packages: HashMap<NormalizedPackageName, PinnedPackage<'db>>,
         favored_packages: HashMap<NormalizedPackageName, PinnedPackage<'db>>,
         options: &'i ResolveOptions,
-        python_location: PythonLocation,
     ) -> miette::Result<Self> {
         let wheel_builder = WheelBuilder::new(
             package_db,
             markers,
             compatible_tags,
             options,
             package_db.cache_dir(),
-            python_location,
         );
 
         Ok(Self {

crates/rattler_installs_packages/src/resolve/solve.rs

@@ -146,6 +146,10 @@ pub struct ResolveOptions {
     /// Defines how to handle sdists during resolution. By default sdists will be treated the same
     /// as wheels.
     pub sdist_resolution: SDistResolution,
+
+    /// Defines what python interpreter to use for resolution. By default the python interpreter
+    /// from the system is used. This is only used during resolution and building of wheel files
+    pub python_location: PythonLocation,
 }
 
 /// Resolves an environment that contains the given requirements and all dependencies of those
@@ -168,7 +172,6 @@ pub async fn resolve<'db>(
     locked_packages: HashMap<NormalizedPackageName, PinnedPackage<'db>>,
     favored_packages: HashMap<NormalizedPackageName, PinnedPackage<'db>>,
     options: &ResolveOptions,
-    python_location: PythonLocation,
 ) -> miette::Result<Vec<PinnedPackage<'db>>> {
     // Construct a provider
     let provider = PypiDependencyProvider::new(
@@ -178,7 +181,6 @@ pub async fn resolve<'db>(
         locked_packages,
         favored_packages,
         options,
-        python_location,
     )?;
     let pool = &provider.pool;
 

crates/rattler_installs_packages/src/wheel_builder/build_environment.rs

@@ -26,6 +26,7 @@ pub(crate) struct BuildEnvironment<'db> {
     build_requirements: Vec<Requirement>,
     resolved_wheels: Vec<PinnedPackage<'db>>,
     venv: VEnv,
+    #[allow(dead_code)]
     python_location: PythonLocation,
 }
 
@@ -90,7 +91,7 @@ impl<'db> BuildEnvironment<'db> {
             .cloned()
             .collect::<Vec<_>>();
 
-        // Install extra requirements if any new ones were foujnd
+        // Install extra requirements if any new ones were found
         if !extra_requirements.is_empty()
             && self.build_requirements.len() != combined_requirements.len()
         {
@@ -106,7 +107,6 @@ impl<'db> BuildEnvironment<'db> {
                 locked_packages,
                 favored_packages,
                 resolve_options,
-                self.python_location.clone(),
             )
             .await
             .map_err(|_| WheelBuildError::CouldNotResolveEnvironment(all_requirements))?;
@@ -154,11 +154,13 @@ impl<'db> BuildEnvironment<'db> {
         env_markers: &MarkerEnvironment,
         wheel_tags: Option<&WheelTags>,
         resolve_options: &ResolveOptions,
-        python_location: PythonLocation,
     ) -> Result<BuildEnvironment<'db>, WheelBuildError> {
         // Setup a work directory and a new env dir
         let work_dir = tempfile::tempdir().unwrap();
-        let venv = VEnv::create(&work_dir.path().join("venv"), python_location.clone())?;
+        let venv = VEnv::create(
+            &work_dir.path().join("venv"),
+            resolve_options.python_location.clone(),
+        )?;
 
         // Find the build system
         let build_system =
@@ -187,7 +189,6 @@ impl<'db> BuildEnvironment<'db> {
             HashMap::default(),
             HashMap::default(),
             resolve_options,
-            python_location.clone(),
         )
         .await
         .map_err(|_| WheelBuildError::CouldNotResolveEnvironment(build_requirements.to_vec()))?;
@@ -232,7 +233,7 @@ impl<'db> BuildEnvironment<'db> {
             entry_point,
             resolved_wheels,
             venv,
-            python_location,
+            python_location: resolve_options.python_location.clone(),
         })
     }
 }

crates/rattler_installs_packages/src/wheel_builder/mod.rs

@@ -11,7 +11,7 @@ use std::{collections::HashMap, path::PathBuf};
 use parking_lot::Mutex;
 use pep508_rs::{MarkerEnvironment, Requirement};
 
-use crate::python_env::{PythonLocation, VEnvError};
+use crate::python_env::VEnvError;
 use crate::resolve::{ResolveOptions, SDistResolution};
 use crate::types::{NormalizedPackageName, ParseArtifactNameError, WheelFilename};
 use crate::wheel_builder::build_environment::BuildEnvironment;
@@ -50,9 +50,6 @@ pub struct WheelBuilder<'db, 'i> {
 
     /// Cache of locally built wheels on the system
     locally_built_wheels: WheelCache,
-
-    /// Location of the python interpreter to use
-    python_location: PythonLocation,
 }
 
 /// An error that can occur while building a wheel
@@ -132,7 +129,6 @@ impl<'db, 'i> WheelBuilder<'db, 'i> {
         wheel_tags: Option<&'i WheelTags>,
         resolve_options: &'i ResolveOptions,
         wheel_cache_dir: &Path,
-        python_location: PythonLocation,
     ) -> Self {
         // We are running into a chicken & egg problem if we want to build wheels for packages that
         // require their build system as sdist as well. For example, `hatchling` requires `hatchling` as
@@ -142,6 +138,7 @@ impl<'db, 'i> WheelBuilder<'db, 'i> {
         let resolve_options = if resolve_options.sdist_resolution == SDistResolution::OnlySDists {
             ResolveOptions {
                 sdist_resolution: SDistResolution::PreferWheels,
+                ..resolve_options.clone()
             }
         } else {
             resolve_options.clone()
@@ -154,7 +151,6 @@ impl<'db, 'i> WheelBuilder<'db, 'i> {
             wheel_tags,
             resolve_options,
             locally_built_wheels: WheelCache::new(wheel_cache_dir.to_path_buf()),
-            python_location,
         }
     }
 
@@ -183,7 +179,6 @@ impl<'db, 'i> WheelBuilder<'db, 'i> {
             self.env_markers,
             self.wheel_tags,
             &self.resolve_options,
-            self.python_location.clone(),
         )
         .await?;
 
@@ -321,7 +316,7 @@ impl<'db, 'i> WheelBuilder<'db, 'i> {
 mod tests {
     use crate::artifacts::SDist;
     use crate::index::PackageDb;
-    use crate::python_env::{Pep508EnvMakers, PythonLocation};
+    use crate::python_env::Pep508EnvMakers;
     use crate::resolve::ResolveOptions;
     use crate::wheel_builder::wheel_cache::WheelKey;
     use crate::wheel_builder::WheelBuilder;
@@ -357,7 +352,6 @@ mod tests {
             None,
             &resolve_options,
             package_db.1.path(),
-            PythonLocation::System,
         );
 
         // Build the wheel

crates/rip_bin/src/main.rs

@@ -130,6 +130,7 @@ async fn actual_main() -> miette::Result<()> {
 
     let resolve_opts = ResolveOptions {
         sdist_resolution: args.sdist_resolution.into(),
+        ..Default::default()
     };
     // Solve the environment
     let blueprint = match resolve(
@@ -140,7 +141,6 @@ async fn actual_main() -> miette::Result<()> {
         HashMap::default(),
         HashMap::default(),
         &resolve_opts,
-        PythonLocation::System,
     )
     .await
     {
@@ -201,7 +201,6 @@ async fn actual_main() -> miette::Result<()> {
             Some(&compatible_tags),
             &resolve_opts,
             package_db.cache_dir(),
-            PythonLocation::System,
         );
 
         for pinned_package in blueprint.into_iter().sorted_by(|a, b| a.name.cmp(&b.name)) {