refactor: lockfile-v7

Cargo.toml

@@ -1,12 +1,11 @@
 [workspace]
-default-members = ["crates/pixi"]
+default-members = [
+  "crates/pixi",
+]
 exclude = [
   # Only pulled in when enabling certain features. We do not want to include
   # these crates when running workspace wide commands.
   "crates/pixi_allocator",
-  # Debug output directories that don't contain Cargo.toml
-  "crates/pixi-build-cmake",
-  "crates/pixi-build-python",
   # Standalone projects that should not be part of the workspace
   "docs",
   "examples",
@@ -88,7 +87,7 @@ ordermap = "1.0.0"
 parking_lot = "0.12.4"
 pathdiff = "0.2.3"
 pep440_rs = "0.7.3"
-pep508_rs = "0.9.2"
+pep508_rs = { version = "0.9.2", features = ["non-pep508-extensions"] }
 percent-encoding = "2.3.1"
 pin-project-lite = "0.2.16"
 pixi_allocator = { path = "crates/pixi_allocator" }
@@ -257,6 +256,29 @@ reqwest-middleware = { git = "https://github.com/astral-sh/reqwest-middleware",
 reqwest-retry = { git = "https://github.com/astral-sh/reqwest-middleware", rev = "7650ed76215a962a96d94a79be71c27bffde7ab2" }
 version-ranges = { git = "https://github.com/astral-sh/pubgrub", rev = "d8efd77673c9a90792da9da31b6c0da7ea8a324b" }
 
+coalesced_map = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+file_url = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_cache = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_conda_types = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_config = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_digest = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_lock = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_menuinst = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_networking = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_package_streaming = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_repodata_gateway = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_shell = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_solve = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_upload = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_redaction = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_virtual_packages = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+rattler_s3 = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+simple_spawn_blocking = { git = "https://github.com/conda/rattler", branch ="feature/lockfile-v7" }
+
+[patch."https://github.com/prefix-dev/rattler-build"]
+#rattler-build = { path = "/var/home/tobias/src/rattler-build" }
+
 [profile.ci]
 codegen-units = 16
 inherits = "release"

crates/pixi/tests/integration_rust/add_tests.rs

@@ -810,10 +810,11 @@ preview = ['pixi-build']
         .unwrap();
 
     let lock = pixi.lock_file().await.unwrap();
+    let p = lock.platform(&Platform::Win64.to_string()).unwrap();
     let git_package = lock
         .default_environment()
         .unwrap()
-        .packages(Platform::Win64)
+        .packages(p)
         .unwrap()
         .find(|p| p.as_conda().unwrap().location().as_str().contains("git+"));
 
@@ -864,10 +865,11 @@ preview = ['pixi-build']
         .unwrap();
 
     let lock = pixi.lock_file().await.unwrap();
+    let p = lock.platform(&Platform::Linux64.to_string()).unwrap();
     let git_package = lock
         .default_environment()
         .unwrap()
-        .packages(Platform::Linux64)
+        .packages(p)
         .unwrap()
         .find(|p| p.as_conda().unwrap().location().as_str().contains("git+"));
 
@@ -923,10 +925,11 @@ preview = ['pixi-build']"#,
 
     // Check the lock file
     let lock = pixi.lock_file().await.unwrap();
+    let p = lock.platform(&Platform::Linux64.to_string()).unwrap();
     let git_package = lock
         .default_environment()
         .unwrap()
-        .packages(Platform::Linux64)
+        .packages(p)
         .unwrap()
         .find(|p| p.as_conda().unwrap().location().as_str().contains("git+"));
 
@@ -979,10 +982,11 @@ preview = ['pixi-build']"#,
 
     // Check the lock file
     let lock = pixi.lock_file().await.unwrap();
+    let p = lock.platform(&Platform::Win64.to_string()).unwrap();
     let git_package = lock
         .default_environment()
         .unwrap()
-        .packages(Platform::Win64)
+        .packages(p)
         .unwrap()
         .find(|p| p.as_conda().unwrap().location().as_str().contains("git+"));
 
@@ -1082,13 +1086,16 @@ platforms = ["{platform}"]
     });
 
     let lock_file = pixi.lock_file().await.unwrap();
+    let p = lock_file
+        .platform(&Platform::current().to_string())
+        .unwrap();
 
-    let (boltons, _) = lock_file
+    let boltons = lock_file
         .default_environment()
         .unwrap()
-        .pypi_packages(Platform::current())
+        .pypi_packages(p)
         .unwrap()
-        .find(|(p, _)| p.name.to_string() == "boltons")
+        .find(|p| p.name.to_string() == "boltons")
         .unwrap();
 
     insta::with_settings!( {filters => vec![