chore: bump rattler (#1614)

Among other things: Fixes #1594 #1609 --------- Co-authored-by: Ruben Arts <[email protected]>
prefix-dev · Jul 19, 2024 · 8b26d03 · 8b26d03
1 parent baeafe5
commit 8b26d03
Show file tree

Hide file tree

Showing 8 changed files with 346 additions and 94 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -54,15 +54,15 @@ percent-encoding = "2.3.1"
 platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.2.18" }
 pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.2.18" }
 pyproject-toml = "0.11.0"
-rattler = { version = "0.26.4", default-features = false }
-rattler_conda_types = { version = "0.25.2", default-features = false }
-rattler_digest = { version = "0.19.4", default-features = false }
-rattler_lock = { version = "0.22.12", default-features = false }
-rattler_networking = { version = "0.20.8", default-features = false }
-rattler_repodata_gateway = { version = "0.20.3", default-features = false }
-rattler_shell = { version = "0.20.6", default-features = false }
-rattler_solve = { version = "0.24.2", default-features = false }
-rattler_virtual_packages = { version = "0.19.3", default-features = false }
+rattler = { version = "0.27.0", default-features = false }
+rattler_conda_types = { version = "0.26.1", default-features = false }
+rattler_digest = { version = "0.19.5", default-features = false }
+rattler_lock = { version = "0.22.14", default-features = false }
+rattler_networking = { version = "0.20.10", default-features = false }
+rattler_repodata_gateway = { version = "0.21.1", default-features = false }
+rattler_shell = { version = "0.21.1", default-features = false }
+rattler_solve = { version = "0.25.1", default-features = false }
+rattler_virtual_packages = { version = "0.19.18", default-features = false }
 regex = "1.10.4"
 requirements-txt = { git = "https://github.com/astral-sh/uv", tag = "0.2.18" }
 reqwest = { version = "0.12.4", default-features = false }

diff --git a/src/activation.rs b/src/activation.rs
@@ -161,16 +161,19 @@ pub async fn run_activation(
 
     let activator_result = match tokio::task::spawn_blocking(move || {
         // Run and cache the activation script
-        activator.run_activation(ActivationVariables {
-            // Get the current PATH variable
-            path: Default::default(),
-
-            // Start from an empty prefix
-            conda_prefix: None,
-
-            // Prepending environment paths so they get found first.
-            path_modification_behavior,
-        })
+        activator.run_activation(
+            ActivationVariables {
+                // Get the current PATH variable
+                path: Default::default(),
+
+                // Start from an empty prefix
+                conda_prefix: None,
+
+                // Prepending environment paths so they get found first.
+                path_modification_behavior,
+            },
+            None,
+        )
     })
     .await
     .into_diagnostic()?

diff --git a/src/lock_file/satisfiability.rs b/src/lock_file/satisfiability.rs
@@ -12,7 +12,7 @@ use pypi_types::{
 };
 use rattler_conda_types::ParseStrictness::Lenient;
 use rattler_conda_types::{
-    GenericVirtualPackage, MatchSpec, ParseMatchSpecError, Platform, RepoDataRecord,
+    GenericVirtualPackage, MatchSpec, Matches, ParseMatchSpecError, Platform, RepoDataRecord,
 };
 use rattler_lock::{
     ConversionError, Package, PypiIndexes, PypiPackageData, PypiSourceTreeHashable, UrlOrPath,

diff --git a/src/prefix.rs b/src/prefix.rs
@@ -35,7 +35,7 @@ impl Prefix {
                 .context("failed to constructor environment activator")?;
 
         activator
-            .run_activation(ActivationVariables::from_env().unwrap_or_default())
+            .run_activation(ActivationVariables::from_env().unwrap_or_default(), None)
             .into_diagnostic()
             .context("failed to run activation")
     }

diff --git a/src/project/manifest/document.rs b/src/project/manifest/document.rs
@@ -478,7 +478,7 @@ mod tests {
             "rattler >=1",
             "conda-forge::rattler",
             "conda-forge::rattler[version=>3.0]",
-            "rattler=1=*cuda",
+            "rattler 1 *cuda",
             "rattler >=1 *cuda",
         ];
 

diff --git a/...roject/manifest/snapshots/pixi__project__manifest__document__tests__nameless_to_toml.snap b/...roject/manifest/snapshots/pixi__project__manifest__document__tests__nameless_to_toml.snap
@@ -1,10 +1,9 @@
 ---
 source: src/project/manifest/document.rs
-assertion_line: 438
 expression: table
 ---
 "rattler >=1" = ">=1"
 "conda-forge::rattler" = { version = "*", channel = "conda-forge" }
 "conda-forge::rattler[version=>3.0]" = { version = ">3.0", channel = "conda-forge" }
-"rattler=1=*cuda" = { version = "==1", build = "*cuda" }
+"rattler 1 *cuda" = { version = "==1", build = "*cuda" }
 "rattler >=1 *cuda" = { version = ">=1", build = "*cuda" }
diff --git a/src/project/manifest/snapshots/pixi__project__manifest__tests__invalid_target_specific.snap b/src/project/manifest/snapshots/pixi__project__manifest__tests__invalid_target_specific.snap
@@ -6,5 +6,4 @@ TOML parse error at line 8, column 9
   |
 8 | [target.foobar.dependencies]
   |         ^^^^^^
-'foobar' is not a known platform. Valid platforms are 'noarch', 'unknown', 'linux-32', 'linux-64', 'linux-aarch64', 'linux-armv6l', 'linux-armv7l', 'linux-ppc64le', 'linux-ppc64', 'linux-s390x', 'linux-riscv32', 'linux-riscv64', 'osx-64', 'osx-arm64', 'win-32', 'win-64', 'win-arm64', 'emscripten-wasm32', 'wasi-wasm32'
-
+'foobar' is not a known platform. Valid platforms are 'noarch', 'unknown', 'linux-32', 'linux-64', 'linux-aarch64', 'linux-armv6l', 'linux-armv7l', 'linux-ppc64le', 'linux-ppc64', 'linux-s390x', 'linux-riscv32', 'linux-riscv64', 'osx-64', 'osx-arm64', 'win-32', 'win-64', 'win-arm64', 'emscripten-wasm32', 'wasi-wasm32', 'zos-z'