refactor: multi-env

Cargo.toml

@@ -19,6 +19,7 @@ slow_integration_tests = []
 assert_matches = "1.5.0"
 async-once-cell = "0.5.3"
 async-recursion = "1.0.5"
+async-scoped = { version = "0.8.0", features = ["use-tokio"] }
 chrono = "0.4.32"
 clap = { version = "4.4.18", default-features = false, features = ["derive", "usage", "wrap_help", "std", "color", "error-context"] }
 clap-verbosity-flag = "2.1.2"

src/activation.rs

@@ -1,3 +1,4 @@
+use indexmap::IndexMap;
 use std::collections::HashMap;
 
 use itertools::Itertools;
@@ -179,19 +180,13 @@ pub async fn get_activation_env<'p>(
     lock_file_usage: LockFileUsage,
 ) -> miette::Result<HashMap<String, String>> {
     // Get the prefix which we can then activate.
-    get_up_to_date_prefix(
-        environment,
-        lock_file_usage,
-        false,
-        None,
-        Default::default(),
-    )
-    .await?;
+    get_up_to_date_prefix(environment, lock_file_usage, false, IndexMap::default()).await?;
 
     // Get environment variables from the activation
-    let activation_env = await_in_progress("activating environment", run_activation(environment))
-        .await
-        .wrap_err("failed to activate environment")?;
+    let activation_env =
+        await_in_progress("activating environment", |_| run_activation(environment))
+            .await
+            .wrap_err("failed to activate environment")?;
 
     let environment_variables = get_environment_variables(environment);
 

src/cli/add.rs

@@ -15,7 +15,6 @@ use rattler_conda_types::{
 };
 use rattler_repodata_gateway::sparse::SparseRepoData;
 use rattler_solve::{resolvo, SolverImpl};
-use rip::resolve::SDistResolution;
 use std::{
     collections::{HashMap, HashSet},
     path::PathBuf,
@@ -86,10 +85,6 @@ pub struct Args {
     /// The platform(s) for which the dependency should be added
     #[arg(long, short)]
     pub platform: Vec<Platform>,
-
-    /// Resolution scheme to use
-    #[arg(skip)]
-    pub sdist_resolution: SDistResolution,
 }
 
 impl DependencyType {
@@ -144,7 +139,6 @@ pub async fn execute(args: Args) -> miette::Result<()> {
                 args.no_install,
                 args.no_lockfile_update,
                 spec_platforms,
-                args.sdist_resolution,
             )
             .await
         }
@@ -174,7 +168,6 @@ pub async fn execute(args: Args) -> miette::Result<()> {
                 spec_platforms,
                 args.no_lockfile_update,
                 args.no_install,
-                args.sdist_resolution,
             )
             .await
         }
@@ -216,7 +209,6 @@ pub async fn add_pypi_specs_to_project(
     specs_platforms: &Vec<Platform>,
     no_update_lockfile: bool,
     no_install: bool,
-    sdist_resolution: SDistResolution,
 ) -> miette::Result<()> {
     for (name, spec) in &specs {
         // TODO: Get best version
@@ -241,8 +233,7 @@ pub async fn add_pypi_specs_to_project(
         &project.default_environment(),
         lock_file_usage,
         no_install,
-        None,
-        sdist_resolution,
+        IndexMap::default(),
     )
     .await?;
 
@@ -258,7 +249,6 @@ pub async fn add_conda_specs_to_project(
     no_install: bool,
     no_update_lockfile: bool,
     specs_platforms: &Vec<Platform>,
-    sdist_resolution: SDistResolution,
 ) -> miette::Result<()> {
     // Split the specs into package name and version specifier
     let new_specs = specs
@@ -341,8 +331,7 @@ pub async fn add_conda_specs_to_project(
         &project.default_environment(),
         lock_file_usage,
         no_install,
-        Some(sparse_repo_data),
-        sdist_resolution,
+        sparse_repo_data,
     )
     .await?;
     project.save()?;

src/cli/global/install.rs

@@ -7,6 +7,7 @@ use indexmap::IndexMap;
 use itertools::Itertools;
 use miette::IntoDiagnostic;
 use rattler::install::Transaction;
+use rattler::package_cache::PackageCache;
 use rattler_conda_types::{Channel, ChannelConfig, MatchSpec, PackageName, Platform, PrefixRecord};
 use rattler_networking::AuthenticationMiddleware;
 use rattler_repodata_gateway::sparse::SparseRepoData;
@@ -433,7 +434,7 @@ pub(super) async fn globally_install_package(
 
     // Create the binary environment prefix where we install or update the package
     let BinEnvDir(bin_prefix) = BinEnvDir::create(&package_name).await?;
-    let prefix = Prefix::new(bin_prefix)?;
+    let prefix = Prefix::new(bin_prefix);
     let prefix_records = prefix.find_installed_packages(None).await?;
 
     // Create the transaction that we need
@@ -448,17 +449,19 @@ pub(super) async fn globally_install_package(
 
     // Execute the transaction if there is work to do
     if has_transactions {
+        let package_cache = Arc::new(PackageCache::new(config::get_cache_dir()?.join("pkgs")));
+
         // Execute the operations that are returned by the solver.
-        await_in_progress(
-            "creating virtual environment",
+        await_in_progress("creating virtual environment", |pb| {
             execute_transaction(
+                package_cache,
                 &transaction,
                 &prefix_records,
                 prefix.root().to_path_buf(),
-                config::get_cache_dir()?,
                 authenticated_client,
-            ),
-        )
+                pb,
+            )
+        })
         .await?;
     }
 

src/cli/global/list.rs

@@ -55,7 +55,7 @@ pub async fn execute(_args: Args) -> miette::Result<()> {
             print_no_packages_found_message();
             return Ok(());
         };
-        let prefix = Prefix::new(bin_env_prefix)?;
+        let prefix = Prefix::new(bin_env_prefix);
 
         let Ok(bin_prefix) = BinDir::from_existing().await else {
             print_no_packages_found_message();

src/cli/global/remove.rs

@@ -32,7 +32,7 @@ pub async fn execute(args: Args) -> miette::Result<()> {
         )
     })?;
     let BinEnvDir(bin_prefix) = BinEnvDir::from_existing(&package_name).await?;
-    let prefix = Prefix::new(bin_prefix.clone())?;
+    let prefix = Prefix::new(bin_prefix.clone());
 
     // Find the installed package in the environment
     let prefix_package = find_designated_package(&prefix, &package_name).await?;

src/cli/info.rs

@@ -281,14 +281,13 @@ pub async fn execute(args: Args) -> miette::Result<()> {
     let (pixi_folder_size, cache_size) = if args.extended {
         let env_dir = project.as_ref().map(|p| p.root().join(".pixi"));
         let cache_dir = config::get_cache_dir()?;
-        await_in_progress(
-            "fetching cache",
+        await_in_progress("fetching cache", |_| {
             spawn_blocking(move || {
                 let env_size = env_dir.and_then(|env| dir_size(env).ok());
                 let cache_size = dir_size(cache_dir).ok();
                 (env_size, cache_size)
-            }),
-        )
+            })
+        })
         .await
         .into_diagnostic()?
     } else {

src/cli/install.rs

@@ -2,6 +2,7 @@ use crate::environment::get_up_to_date_prefix;
 use crate::project::manifest::EnvironmentName;
 use crate::Project;
 use clap::Parser;
+use indexmap::IndexMap;
 use std::path::PathBuf;
 
 /// Install all dependencies
@@ -31,8 +32,7 @@ pub async fn execute(args: Args) -> miette::Result<()> {
         &environment,
         args.lock_file_usage.into(),
         false,
-        None,
-        Default::default(),
+        IndexMap::default(),
     )
     .await?;
 

src/cli/project/channel/add.rs

@@ -3,6 +3,7 @@ use crate::project::manifest::channel::PrioritizedChannel;
 use crate::project::manifest::FeatureName;
 use crate::Project;
 use clap::Parser;
+use indexmap::IndexMap;
 use miette::IntoDiagnostic;
 use rattler_conda_types::{Channel, ChannelConfig};
 #[derive(Parser, Debug, Default)]
@@ -51,8 +52,7 @@ pub async fn execute(mut project: Project, args: Args) -> miette::Result<()> {
         &project.default_environment(),
         LockFileUsage::Update,
         args.no_install,
-        None,
-        Default::default(),
+        IndexMap::default(),
     )
     .await?;
     project.save()?;

src/cli/project/channel/remove.rs

@@ -4,6 +4,7 @@ use crate::project::manifest::channel::PrioritizedChannel;
 use crate::project::manifest::FeatureName;
 use crate::Project;
 use clap::Parser;
+use indexmap::IndexMap;
 use miette::IntoDiagnostic;
 use rattler_conda_types::{Channel, ChannelConfig};
 
@@ -53,8 +54,7 @@ pub async fn execute(mut project: Project, args: Args) -> miette::Result<()> {
         &project.default_environment(),
         LockFileUsage::Update,
         args.no_install,
-        None,
-        Default::default(),
+        IndexMap::default(),
     )
     .await?;
     project.save()?;

src/cli/project/platform/add.rs

@@ -3,6 +3,7 @@ use std::str::FromStr;
 use crate::environment::{get_up_to_date_prefix, LockFileUsage};
 use crate::Project;
 use clap::Parser;
+use indexmap::IndexMap;
 use itertools::Itertools;
 use miette::IntoDiagnostic;
 use rattler_conda_types::Platform;
@@ -48,8 +49,7 @@ pub async fn execute(mut project: Project, args: Args) -> miette::Result<()> {
         &project.default_environment(),
         LockFileUsage::Update,
         args.no_install,
-        None,
-        Default::default(),
+        IndexMap::default(),
     )
     .await?;
     project.save()?;

src/cli/project/platform/remove.rs

@@ -2,6 +2,7 @@ use crate::environment::{get_up_to_date_prefix, LockFileUsage};
 
 use crate::Project;
 use clap::Parser;
+use indexmap::IndexMap;
 use itertools::Itertools;
 use miette::IntoDiagnostic;
 use rattler_conda_types::Platform;
@@ -49,8 +50,7 @@ pub async fn execute(mut project: Project, args: Args) -> miette::Result<()> {
         &project.default_environment(),
         LockFileUsage::Update,
         args.no_install,
-        None,
-        Default::default(),
+        IndexMap::default(),
     )
     .await?;
     project.save()?;

src/cli/remove.rs

@@ -2,6 +2,7 @@ use std::path::PathBuf;
 use std::str::FromStr;
 
 use clap::Parser;
+use indexmap::IndexMap;
 use miette::miette;
 use rattler_conda_types::Platform;
 
@@ -123,8 +124,7 @@ pub async fn execute(args: Args) -> miette::Result<()> {
         &project.default_environment(),
         LockFileUsage::Update,
         false,
-        None,
-        Default::default(),
+        IndexMap::default(),
     )
     .await?;
 

src/cli/run.rs

@@ -63,10 +63,30 @@ pub async fn execute(args: Args) -> miette::Result<()> {
         .context("failed to construct task graph from command line arguments")?;
 
     // Traverse the task graph in topological order and execute each individual task.
+    let mut task_idx = 0;
     let mut task_envs = HashMap::new();
     for task_id in task_graph.topological_order() {
         let executable_task = ExecutableTask::from_task_graph(&task_graph, task_id);
 
+        // If the task is not executable (e.g. an alias), we skip it. This ensures we don't
+        // instantiate a prefix for an alias.
+        if !executable_task.task().is_executable() {
+            continue;
+        }
+
+        // Showing which command is being run if the level and type allows it.
+        if tracing::enabled!(Level::WARN) && !executable_task.task().is_custom() {
+            if task_idx > 0 {
+                // Add a newline between task outputs
+                eprintln!();
+            }
+            eprintln!(
+                "{}{}",
+                console::style("✨ Pixi task: ").bold(),
+                executable_task.display_command(),
+            );
+        }
+
         // If we don't have a command environment yet, we need to compute it. We lazily compute the
         // task environment because we only need the environment if a task is actually executed.
         let task_env: &_ = match task_envs.entry(environment.clone()) {
@@ -80,7 +100,9 @@ pub async fn execute(args: Args) -> miette::Result<()> {
         // Execute the task itself within the command environment. If one of the tasks failed with
         // a non-zero exit code, we exit this parent process with the same code.
         match execute_task(&executable_task, task_env).await {
-            Ok(_) => {}
+            Ok(_) => {
+                task_idx += 1;
+            }
             Err(TaskExecutionError::NonZeroExitCode(code)) => {
                 if code == 127 {
                     command_not_found(&project);
@@ -159,15 +181,6 @@ async fn execute_task<'p>(
     // some other command we might want to revaluate this.
     let ctrl_c = tokio::spawn(async { while tokio::signal::ctrl_c().await.is_ok() {} });
 
-    // Showing which command is being run if the level and type allows it.
-    if tracing::enabled!(Level::WARN) && !task.task().is_custom() {
-        eprintln!(
-            "{}{}",
-            console::style("✨ Pixi task: ").bold(),
-            task.display_command(),
-        );
-    }
-
     let execute_future =
         deno_task_shell::execute(script, command_env.clone(), &cwd, Default::default());
     let status_code = tokio::select! {