Fix/wrap uv normalized name in struct

Cargo.toml

@@ -11,23 +11,45 @@ readme = "README.md"
 
 [features]
 default = ["native-tls"]
-native-tls = ["reqwest/native-tls", "rattler_repodata_gateway/native-tls", "rattler/native-tls", "rip/native-tls"]
-rustls-tls = ["reqwest/rustls-tls", "reqwest/rustls-tls-native-roots", "rattler_repodata_gateway/rustls-tls", "rattler/rustls-tls", "rip/rustls-tls"]
+tokio-console-subscriber = ["tokio/tracing", "dep:console-subscriber"]
+native-tls = [
+    "reqwest/native-tls",
+    "rattler_repodata_gateway/native-tls",
+    "rattler/native-tls",
+]
+rustls-tls = [
+    "reqwest/rustls-tls",
+    "reqwest/rustls-tls-native-roots",
+    "rattler_repodata_gateway/rustls-tls",
+    "rattler/rustls-tls",
+]
 slow_integration_tests = []
 
 [dependencies]
 assert_matches = "1.5.0"
 async-once-cell = "0.5.3"
 async-recursion = "1.0.5"
-async-scoped = { version = "0.8.0", features = ["use-tokio"] }
+cfg-if = "1.0.0"
 chrono = "0.4.33"
-clap = { version = "4.5.0", default-features = false, features = ["derive", "usage", "wrap_help", "std", "color", "error-context", "env"] }
+clap = { version = "4.5.0", default-features = false, features = [
+    "derive",
+    "usage",
+    "wrap_help",
+    "std",
+    "color",
+    "error-context",
+    "env",
+] }
 clap-verbosity-flag = "2.1.2"
 clap_complete = "4.5.0"
 console = { version = "0.15.8", features = ["windows-console-colors"] }
+
+console-subscriber = { version = "0.2.0", optional = true }
 deno_task_shell = "0.14.4"
 dialoguer = "0.11.0"
 dirs = "5.0.1"
+distribution-filename = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+distribution-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
 dunce = "1.0.4"
 flate2 = "1.0.28"
 futures = "0.3.30"
@@ -37,28 +59,44 @@ humantime = "2.1.0"
 indexmap = { version = "2.2.2", features = ["serde"] }
 indicatif = "0.17.7"
 insta = { version = "1.34.0", features = ["yaml"] }
+install-wheel-rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
 is_executable = "1.0.1"
 itertools = "0.12.1"
 lazy_static = "1.4.0"
-miette = { version = "7.0.0", features = ["fancy", "supports-color", "supports-hyperlinks", "supports-unicode", "terminal_size", "textwrap"] }
+miette = { version = "7.0.0", features = [
+    "fancy",
+    "supports-color",
+    "supports-hyperlinks",
+    "supports-unicode",
+    "terminal_size",
+    "textwrap",
+] }
 minijinja = { version = "1.0.12", features = ["builtins"] }
 once_cell = "1.19.0"
-pep440_rs = "0.4.0"
-pep508_rs = { version = "0.3.0", features = ["modern"] }
+pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+platform-host = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
 rattler = { version = "0.18.0", default-features = false }
 rattler_conda_types = { version = "0.18.0", default-features = false }
 rattler_digest = { version = "0.18.0", default-features = false }
 rattler_lock = { version = "0.18.0", default-features = false }
 rattler_networking = { version = "0.18.0", default-features = false }
-rattler_repodata_gateway = { version = "0.18.0", default-features = false, features = ["sparse"] }
-rattler_shell = { version = "0.18.0", default-features = false, features = ["sysinfo"] }
-rattler_solve = { version = "0.18.0", default-features = false, features = ["resolvo"] }
+rattler_repodata_gateway = { version = "0.18.0", default-features = false, features = [
+    "sparse",
+] }
+rattler_shell = { version = "0.18.0", default-features = false, features = [
+    "sysinfo",
+] }
+rattler_solve = { version = "0.18.0", default-features = false, features = [
+    "resolvo",
+] }
 rattler_virtual_packages = { version = "0.18.0", default-features = false }
 regex = "1.10.3"
 reqwest = { version = "0.11.24", default-features = false }
 reqwest-middleware = "0.2.4"
 reqwest-retry = "0.3.0"
-rip = { package = "rattler_installs_packages", version = "0.8.1", default-features = false }
 self-replace = "1.3.7"
 serde = "1.0.196"
 serde-untagged = "0.1.5"
@@ -72,17 +110,39 @@ strsim = "0.10.0"
 tabwriter = { version = "1.4.0", features = ["ansi_formatting"] }
 tar = "0.4.40"
 tempfile = "3.10.0"
-thiserror = "1.0.56"
-tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread", "signal"] }
+thiserror = "1.0.57"
+tokio = { version = "1.36.0", features = [
+    "macros",
+    "rt-multi-thread",
+    "signal",
+] }
 tokio-util = "0.7.10"
 toml_edit = { version = "0.21.1", features = ["serde"] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 url = "2.5.0"
-zip = { version = "0.6.6", default-features = false, features = ["deflate", "time"] }
+uv-cache = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+uv-client = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+uv-dispatch = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+uv-distribution = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+uv-installer = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+uv-interpreter = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+uv-normalize = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+uv-resolver = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+uv-traits = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+
+zip = { version = "0.6.6", default-features = false, features = [
+    "deflate",
+    "time",
+] }
 
 [target.'cfg(unix)'.dependencies]
-nix = { version = "0.27.1", default-features = false, features = ["fs", "signal", "term", "poll"] }
+nix = { version = "0.27.1", default-features = false, features = [
+    "fs",
+    "signal",
+    "term",
+    "poll",
+] }
 libc = { version = "0.2.153", default-features = false }
 signal-hook = "0.3.17"
 
@@ -95,19 +155,20 @@ tokio = { version = "1.36.0", features = ["rt"] }
 toml = "0.8.10"
 
 [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_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" }
-#rip = { package = "rattler_installs_packages", git = "https://github.com/prefix-dev/rattler_installs_packages", branch = "main"}
-#resolvo = { git = "https://github.com/mamba-org/resolvo.git", branch = "main" }
-#deno_task_shell = { path = "../deno_task_shell" }
+# For pyproject-toml
+# pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
+# pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.8" }
 
+rattler = { git = "https://github.com/baszalmstra/rattler", rev = "e18356d674913385eb2c4ebb5a3407a329907409" }
+rattler_conda_types = { git = "https://github.com/baszalmstra/rattler", rev = "e18356d674913385eb2c4ebb5a3407a329907409" }
+rattler_digest = { git = "https://github.com/baszalmstra/rattler", rev = "e18356d674913385eb2c4ebb5a3407a329907409" }
+rattler_lock = { git = "https://github.com/baszalmstra/rattler", rev = "e18356d674913385eb2c4ebb5a3407a329907409" }
+rattler_networking = { git = "https://github.com/baszalmstra/rattler", rev = "e18356d674913385eb2c4ebb5a3407a329907409" }
+rattler_repodata_gateway = { git = "https://github.com/baszalmstra/rattler", rev = "e18356d674913385eb2c4ebb5a3407a329907409" }
+rattler_shell = { git = "https://github.com/baszalmstra/rattler", rev = "e18356d674913385eb2c4ebb5a3407a329907409" }
+rattler_solve = { git = "https://github.com/baszalmstra/rattler", rev = "e18356d674913385eb2c4ebb5a3407a329907409" }
+rattler_virtual_packages = { git = "https://github.com/baszalmstra/rattler", rev = "e18356d674913385eb2c4ebb5a3407a329907409" }
+#deno_task_shell = { path = "../deno_task_shell" }
 #rattler = { path = "../rattler/crates/rattler" }
 #rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" }
 #rattler_digest = { path = "../rattler/crates/rattler_digest" }
@@ -118,3 +179,23 @@ toml = "0.8.10"
 #rattler_virtual_packages = { path = "../rattler/crates/rattler_virtual_packages" }
 #rattler_lock = { path = "../rattler/crates/rattler_lock" }
 #rip = { package = "rattler_installs_packages", path = "../rip" }
+
+# When using a local version of uv, the following lines should be used instead of the above
+[patch.'https://github.com/astral-sh/uv']
+pep440_rs = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+pep508_rs = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+uv-cache = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+uv-client = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+uv-dispatch = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+uv-distribution = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+uv-installer = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+uv-interpreter = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+uv-normalize = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+uv-resolver = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+uv-traits = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+distribution-filename = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+distribution-types = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+install-wheel-rs = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+platform-host = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+platform-tags = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }
+pypi-types = { git = "https://github.com/tdejager/uv", branch = "feat/env-variables-for-sdist-building" }