feat: add backward compat logic for older lock files (prefix-dev#1425)

nichmor · May 23, 2024 · 2875be2 · 2875be2
1 parent 6ee05c1
commit 2875be2
Show file tree

Hide file tree

Showing 10 changed files with 1,357 additions and 1,017 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -83,9 +83,9 @@ pyproject-toml = "0.10.0"
 rattler = { version = "0.24.1", default-features = false, features = [
     "cli-tools",
 ] }
-rattler_conda_types = { version = "0.23.0", default-features = false }
+rattler_conda_types = { version = "0.23.1", default-features = false }
 rattler_digest = { version = "0.19.3", default-features = false }
-rattler_lock = { version = "=0.22.6", default-features = false }
+rattler_lock = { version = "=0.22.7", default-features = false }
 rattler_networking = { version = "0.20.6", default-features = false }
 rattler_repodata_gateway = { version = "0.20.1", default-features = false, features = [
     "sparse",
@@ -158,6 +158,10 @@ nix = { version = "0.28.0", default-features = false, features = [
 libc = { version = "0.2.153", default-features = false }
 signal-hook = "0.3.17"
 
+# Remove this after updating to uv >= 0.1.40
+[target.'cfg(windows)'.dependencies]
+winapi = { version = "0.3.9", features = ["fileapi", "handleapi", "ioapiset", "winbase", "winioctl", "winnt"] }
+
 [dev-dependencies]
 insta = { version = "1.38.0", features = ["yaml", "glob"] }
 rattler_digest = "0.19.3"
@@ -173,26 +177,26 @@ pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.38" }
 pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.38" }
 # deno_task_shell = { path = "../deno_task_shell" }
 
-#rattler = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
-#rattler_conda_types = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
-#rattler_digest = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
-#rattler_lock = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
-#rattler_networking = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
-#rattler_repodata_gateway = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
-#rattler_shell = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
-#rattler_solve = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
-#rattler_virtual_packages = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
+# 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_lock = { 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_conda_types = { path = "../rattler/crates/rattler_conda_types" }
-#rattler_digest = { path = "../rattler/crates/rattler_digest" }
-#rattler_networking = { path = "../rattler/crates/rattler_networking" }
-#rattler_repodata_gateway = { path = "../rattler/crates/rattler_repodata_gateway" }
-#rattler_shell = { path = "../rattler/crates/rattler_shell" }
-#rattler_solve = { path = "../rattler/crates/rattler_solve" }
-#rattler_virtual_packages = { path = "../rattler/crates/rattler_virtual_packages" }
-#rattler_lock = { path = "../rattler/crates/rattler_lock" }
-#rattler_package_streaming = { path = "../rattler/crates/rattler_package_streaming" }
-#rattler = { path = "../rattler/crates/rattler" }
+# rattler_conda_types = { path = "../rattler-1/crates/rattler_conda_types" }
+# rattler_digest = { path = "../rattler-1/crates/rattler_digest" }
+# rattler_networking = { path = "../rattler-1/crates/rattler_networking" }
+# rattler_repodata_gateway = { path = "../rattler-1/crates/rattler_repodata_gateway" }
+# rattler_shell = { path = "../rattler-1/crates/rattler_shell" }
+# rattler_solve = { path = "../rattler-1/crates/rattler_solve" }
+# rattler_virtual_packages = { path = "../rattler-1/crates/rattler_virtual_packages" }
+# rattler_lock = { path = "../rattler-1/crates/rattler_lock" }
+# rattler_package_streaming = { path = "../rattler-1/crates/rattler_package_streaming" }
+# rattler = { path = "../rattler-1/crates/rattler" }
 
 # Change these lines if you want a patched version of uv
 # [patch.'https://github.com/astral-sh/uv']