From 989f5158b47175bb56d17079daac8c930c035eb1 Mon Sep 17 00:00:00 2001 From: Bas Zalmstra Date: Tue, 13 Feb 2024 17:29:28 +0100 Subject: [PATCH] bump: rattler 0.18.0 (#805) Removes the git references and instead directly targets the latest release. No code changes required. :) --- Cargo.lock | 84 +++++++++++++++++++++++++++++++++++------------------- Cargo.toml | 38 ++++++++++++------------ 2 files changed, 74 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 88c2c1d8a..6ed8c6bf2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2708,7 +2708,7 @@ dependencies = [ "pep508_rs", "rattler", "rattler_conda_types", - "rattler_digest", + "rattler_digest 0.18.0", "rattler_installs_packages", "rattler_lock", "rattler_networking", @@ -2929,8 +2929,9 @@ dependencies = [ [[package]] name = "rattler" -version = "0.17.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#4fc2d38ee482aeb154d75cd3423577d3bcc6b3f9" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66646eab0e70a01b8cf372e10e57a5022f8d111b18870078d2e186f6938f0c5c" dependencies = [ "anyhow", "async-compression", @@ -2951,7 +2952,7 @@ dependencies = [ "once_cell", "pin-project-lite", "rattler_conda_types", - "rattler_digest", + "rattler_digest 0.18.0", "rattler_networking", "rattler_package_streaming", "reflink-copy", @@ -2974,8 +2975,9 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.17.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#4fc2d38ee482aeb154d75cd3423577d3bcc6b3f9" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "085a4ebf784b325311890f7c1dfb9dc017cecb44049cfafef73e02e925e24e22" dependencies = [ "chrono", "fxhash", @@ -2986,7 +2988,7 @@ dependencies = [ "lazy-regex", "nom", "purl", - "rattler_digest", + "rattler_digest 0.18.0", "rattler_macros", "regex", "serde", @@ -3004,7 +3006,23 @@ dependencies = [ [[package]] name = "rattler_digest" version = "0.17.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#4fc2d38ee482aeb154d75cd3423577d3bcc6b3f9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26606e577c9c5b214023c8a31a12753cffd2b09a6768d1d556b99ae9d730bc23" +dependencies = [ + "blake2", + "digest", + "hex", + "md-5", + "serde", + "serde_with", + "sha2", +] + +[[package]] +name = "rattler_digest" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e8b55bd7e3c9efa337b59a26964584975c345bf484eca9fb849b65c2674cee" dependencies = [ "blake2", "digest", @@ -3056,7 +3074,7 @@ dependencies = [ "pep508_rs", "pin-project-lite", "pyproject-toml", - "rattler_digest", + "rattler_digest 0.17.0", "regex", "reqwest", "reqwest-middleware", @@ -3078,8 +3096,9 @@ dependencies = [ [[package]] name = "rattler_lock" -version = "0.17.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#4fc2d38ee482aeb154d75cd3423577d3bcc6b3f9" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e0c6694a1e2ce7f9c3b08920ee717890fc7814ca36bcfefc7ec6fff9daac97" dependencies = [ "chrono", "fxhash", @@ -3089,7 +3108,7 @@ dependencies = [ "pep508_rs", "purl", "rattler_conda_types", - "rattler_digest", + "rattler_digest 0.18.0", "serde", "serde-json-python-formatter", "serde_json", @@ -3101,8 +3120,9 @@ dependencies = [ [[package]] name = "rattler_macros" -version = "0.17.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#4fc2d38ee482aeb154d75cd3423577d3bcc6b3f9" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a96e90500af30b653b0c4e08fa572a6d4dfc821c5e213b510a195987b8ed133" dependencies = [ "quote", "syn 2.0.48", @@ -3110,8 +3130,9 @@ dependencies = [ [[package]] name = "rattler_networking" -version = "0.17.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#4fc2d38ee482aeb154d75cd3423577d3bcc6b3f9" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc36da705ddde163d228bb140eecf521b390716b83db943a43f6606b31954b1" dependencies = [ "anyhow", "async-trait", @@ -3138,8 +3159,9 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.17.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#4fc2d38ee482aeb154d75cd3423577d3bcc6b3f9" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a27f4784ab14191fb9ae0218979f2ccee0f8cb1ca5c82440c7f38e0fd83808d6" dependencies = [ "bzip2", "chrono", @@ -3147,7 +3169,7 @@ dependencies = [ "itertools", "num_cpus", "rattler_conda_types", - "rattler_digest", + "rattler_digest 0.18.0", "rattler_networking", "reqwest", "reqwest-middleware", @@ -3164,8 +3186,9 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.17.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#4fc2d38ee482aeb154d75cd3423577d3bcc6b3f9" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dbcfb255c1dc4e053c2fcac724d2ce404ec40056dea0a50c9f6d949c0a47a80" dependencies = [ "anyhow", "async-compression", @@ -3184,7 +3207,7 @@ dependencies = [ "ouroboros", "pin-project-lite", "rattler_conda_types", - "rattler_digest", + "rattler_digest 0.18.0", "rattler_networking", "reqwest", "reqwest-middleware", @@ -3203,8 +3226,9 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.17.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#4fc2d38ee482aeb154d75cd3423577d3bcc6b3f9" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abda3f6112eae2afef9e6b3bc88582c884c1c04765a4b9d7bcf2acb706eaded3" dependencies = [ "enum_dispatch", "indexmap 2.2.2", @@ -3220,8 +3244,9 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "0.17.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#4fc2d38ee482aeb154d75cd3423577d3bcc6b3f9" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7f6035ffc8b6361917d50df6db53cb1002b2042eb6c2bd509dbb5697bbcca1" dependencies = [ "anyhow", "chrono", @@ -3229,7 +3254,7 @@ dependencies = [ "hex", "itertools", "rattler_conda_types", - "rattler_digest", + "rattler_digest 0.18.0", "resolvo", "serde", "tempfile", @@ -3240,8 +3265,9 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "0.17.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#4fc2d38ee482aeb154d75cd3423577d3bcc6b3f9" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d1748ab835be1aab75c6a055889cded915b0e70b6787bd46e0abf9a8ba65a5" dependencies = [ "cfg-if", "libloading", diff --git a/Cargo.toml b/Cargo.toml index 017f04c0f..820b137ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,15 +44,15 @@ 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"] } -rattler = { version = "0.17.0", default-features = false } -rattler_conda_types = { version = "0.17.0", default-features = false } -rattler_digest = { version = "0.17.0", default-features = false } -rattler_lock = { version = "0.17.0", default-features = false } -rattler_networking = { version = "0.17.0", default-features = false } -rattler_repodata_gateway = { version = "0.17.0", default-features = false, features = ["sparse"] } -rattler_shell = { version = "0.17.0", default-features = false, features = ["sysinfo"] } -rattler_solve = { version = "0.17.0", default-features = false, features = ["resolvo"] } -rattler_virtual_packages = { version = "0.17.0", default-features = false } +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_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" @@ -84,7 +84,7 @@ libc = { version = "0.2.153", default-features = false } signal-hook = "0.3.17" [dev-dependencies] -rattler_digest = "0.17.0" +rattler_digest = "0.18.0" rstest = "0.18.2" serde_json = "1.0.113" serial_test = "2.0.0" @@ -92,15 +92,15 @@ 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" } +#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" }