perf: update resolvo (#881)

conda · Oct 1, 2024 · e47e7a6 · e47e7a6
1 parent 1a463eb
commit e47e7a6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -110,7 +110,7 @@ regex = "1.10.4"
 reqwest = { version = "0.12.3", default-features = false }
 reqwest-middleware = "0.3.0"
 reqwest-retry = "0.6.0"
-resolvo = { version = "0.8.0" }
+resolvo = { version = "0.8.1" }
 retry-policies = { version = "0.4.0", default-features = false }
 rmp-serde = { version = "1.2.0" }
 rstest = { version = "0.21.0" }

diff --git a/crates/rattler_solve/tests/snapshots/backends__resolvo__solve_with_error.snap b/crates/rattler_solve/tests/snapshots/backends__resolvo__solve_with_error.snap
@@ -4,9 +4,8 @@ expression: err
 ---
 Cannot solve the request because of: The following packages are incompatible
 ├─ bors >=2 can be installed with any of the following options:
-│  └─ bors 2.0
+│  └─ bors 2.0 | 2.1
 └─ foobar >=2 cannot be installed because there are no viable options:
    └─ foobar 2.0 | 2.1 would require
       └─ bors <2.0, which cannot be installed because there are no viable options:
-         ├─ bors 1.2.1, which conflicts with the versions reported above.
-         └─ bors 1.0 | 1.1, which conflicts with the versions reported above.
+         └─ bors 1.0 | 1.1 | 1.2.1, which conflicts with the versions reported above.
diff --git a/py-rattler/Cargo.lock b/py-rattler/Cargo.lock
diff --git a/py-rattler/Cargo.toml b/py-rattler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "py-rattler"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 license = "BSD-3-Clause"
 publish = false