bump: 0.5.0-dev and rattler (#361)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pixi"
-version = "0.4.0"
+version = "0.5.0-dev"
 description = "A package management and workflow tool"
 edition = "2021"
 authors = ["pixi contributors <[email protected]>"]
@@ -41,7 +41,7 @@ rattler_digest = { version = "0.9.0", default-features = false }
 rattler_networking = { version = "0.9.0", default-features = false }
 rattler_repodata_gateway = { version = "0.9.0", default-features = false, features = ["sparse"] }
 rattler_shell = { version = "0.9.0", default-features = false, features = ["sysinfo"] }
-rattler_solve = { version = "0.9.0", default-features = false, features = ["libsolv_rs"] }
+rattler_solve = { version = "0.9.0", default-features = false, features = ["resolvo"] }
 rattler_virtual_packages = { version = "0.9.0", default-features = false }
 reqwest = { version = "0.11.20", default-features = false }
 serde = "1.0.188"
@@ -71,14 +71,14 @@ tokio = { version = "1.32.0", features = ["rt"] }
 toml = "0.7.6"
 
 [patch.crates-io]
-#rattler = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_conda_types = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_digest = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_networking = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_shell = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_solve = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_conda_types = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_digest = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_networking = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_shell = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_solve = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", branch = "main" }
 
 #rattler = { path = "../rattler/crates/rattler" }
 #rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" }

src/cli/add.rs

@@ -17,7 +17,7 @@ use rattler_conda_types::{
     MatchSpec, NamelessMatchSpec, Platform, StrictVersion, Version, VersionSpec,
 };
 use rattler_repodata_gateway::sparse::SparseRepoData;
-use rattler_solve::{libsolv_rs, SolverImpl};
+use rattler_solve::{resolvo, SolverImpl};
 use std::collections::HashMap;
 use std::path::PathBuf;
 
@@ -305,7 +305,7 @@ pub fn determine_best_version(
         pinned_packages: vec![],
     };
 
-    let records = libsolv_rs::Solver.solve(task).into_diagnostic()?;
+    let records = resolvo::Solver.solve(task).into_diagnostic()?;
 
     // Determine the versions of the new packages
     Ok(records

src/cli/global/install.rs

@@ -16,7 +16,7 @@ use rattler_shell::{
     shell::Shell,
     shell::ShellEnum,
 };
-use rattler_solve::{libsolv_rs, SolverImpl};
+use rattler_solve::{resolvo, SolverImpl};
 use std::{
     path::{Path, PathBuf},
     str::FromStr,
@@ -329,7 +329,7 @@ pub async fn execute(args: Args) -> miette::Result<()> {
     };
 
     // Solve it
-    let records = libsolv_rs::Solver.solve(task).into_diagnostic()?;
+    let records = resolvo::Solver.solve(task).into_diagnostic()?;
 
     // Create the binary environment prefix where we install or update the package
     let BinEnvDir(bin_prefix) = BinEnvDir::create(&package_name).await?;

src/environment.rs

@@ -24,7 +24,7 @@ use rattler_conda_types::{
 };
 use rattler_networking::AuthenticatedClient;
 use rattler_repodata_gateway::sparse::SparseRepoData;
-use rattler_solve::{libsolv_rs, SolverImpl};
+use rattler_solve::{resolvo, SolverImpl};
 use std::collections::HashMap;
 use std::{
     collections::{HashSet, VecDeque},
@@ -352,7 +352,7 @@ pub async fn update_lock_file(
         };
 
         // Solve the task
-        let records = libsolv_rs::Solver.solve(task).into_diagnostic()?;
+        let records = resolvo::Solver.solve(task).into_diagnostic()?;
 
         // Update lock file
         let mut locked_packages = LockedPackages::new(platform);

src/repodata.rs

@@ -129,7 +129,7 @@ async fn fetch_repo_data_records_with_progress(
     let result = fetch::fetch_repo_data(
         channel.platform_url(platform),
         client,
-        repodata_cache,
+        repodata_cache.to_path_buf(),
         Default::default(),
         Some(Box::new(move |fetch::DownloadProgress { total, bytes }| {
             download_progress_progress_bar.set_length(total.unwrap_or(bytes));