From a78100fb2dc41afbe290dab3f64cc400f0d2f792 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Mar 2025 00:20:18 +0000 Subject: [PATCH] chore(deps): bump zip from 2.2.2 to 2.3.0 in /trampoline Bumps [zip](https://github.com/zip-rs/zip2) from 2.2.2 to 2.3.0. - [Release notes](https://github.com/zip-rs/zip2/releases) - [Changelog](https://github.com/zip-rs/zip2/blob/master/CHANGELOG.md) - [Commits](https://github.com/zip-rs/zip2/compare/v2.2.2...v2.3.0) --- updated-dependencies: - dependency-name: zip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- trampoline/Cargo.lock | 188 +++++++++++++++++++++++++++++++----------- 2 files changed, 140 insertions(+), 50 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9c8b379f0d..8602e9203e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -136,7 +136,7 @@ uv-resolver = { git = "https://github.com/wolfv/uv", branch = "ignore-rayon-init uv-types = { git = "https://github.com/wolfv/uv", branch = "ignore-rayon-init" } winapi = { version = "0.3.9", default-features = false } xxhash-rust = "0.8.13" -zip = { version = "2.2.2", default-features = false } +zip = { version = "2.3.0", default-features = false } zstd = { version = "0.13.2", default-features = false } fancy_display = { path = "crates/fancy_display" } diff --git a/trampoline/Cargo.lock b/trampoline/Cargo.lock index 39b1eb5b73..3818237d14 100644 --- a/trampoline/Cargo.lock +++ b/trampoline/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -319,6 +319,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + [[package]] name = "bitflags" version = "2.6.0" @@ -676,7 +682,7 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core", + "parking_lot_core 0.9.10", ] [[package]] @@ -904,7 +910,7 @@ checksum = "95ad84121770c9766a67e4dd0a96b0467c6a5a2c43e873bf853aeaa6632b687c" dependencies = [ "itertools 0.13.0", "percent-encoding", - "thiserror 2.0.8", + "thiserror 2.0.12", "typed-path", "url", ] @@ -1636,6 +1642,18 @@ dependencies = [ "generic-array", ] +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "ipnet" version = "2.10.1" @@ -1799,9 +1817,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags", + "bitflags 2.6.0", "libc", - "redox_syscall", + "redox_syscall 0.5.7", ] [[package]] @@ -1948,7 +1966,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -2150,6 +2168,17 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + [[package]] name = "parking_lot" version = "0.12.3" @@ -2157,7 +2186,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core", + "parking_lot_core 0.9.10", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", ] [[package]] @@ -2168,7 +2211,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.7", "smallvec", "windows-targets 0.52.6", ] @@ -2334,7 +2377,7 @@ dependencies = [ "serde", "serde_ignored", "serde_json", - "thiserror 2.0.8", + "thiserror 2.0.12", "toml_edit", "tracing", "url", @@ -2378,11 +2421,12 @@ dependencies = [ "rattler_networking", "reqwest", "reqwest-middleware", + "reqwest-retry", "serde", "serde_json", "serde_yaml", "tempfile", - "thiserror 2.0.8", + "thiserror 2.0.12", "tracing", "tracing-subscriber", "url", @@ -2489,7 +2533,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.8", + "thiserror 2.0.12", "tokio", "tracing", ] @@ -2508,7 +2552,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.8", + "thiserror 2.0.12", "tinyvec", "tracing", "web-time", @@ -2569,9 +2613,9 @@ dependencies = [ [[package]] name = "rattler" -version = "0.28.8" +version = "0.28.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb6b55310ef1c0479d8ec23bdaf4f243cad29c7b0e4a855c72e6b2e51bd649e0" +checksum = "c90d5a0dd356a4b2289752dd738d5597348d616a7797ec045209c4cc8b65bb9b" dependencies = [ "anyhow", "digest", @@ -2584,7 +2628,7 @@ dependencies = [ "memchr", "memmap2", "once_cell", - "parking_lot", + "parking_lot 0.12.3", "rattler_cache", "rattler_conda_types", "rattler_digest", @@ -2599,7 +2643,7 @@ dependencies = [ "simple_spawn_blocking", "smallvec", "tempfile", - "thiserror 2.0.8", + "thiserror 2.0.12", "tokio", "tracing", "url", @@ -2608,9 +2652,9 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1c21d2868933899284c54f0336269dd1e8f63b979c9a8256020f166cea176b3" +checksum = "266a244026ae404be929fa7cdb36761848dadc238868448d0fcb6c900522ee72" dependencies = [ "anyhow", "dashmap", @@ -2621,7 +2665,7 @@ dependencies = [ "futures", "fxhash", "itertools 0.13.0", - "parking_lot", + "parking_lot 0.12.3", "rattler_conda_types", "rattler_digest", "rattler_networking", @@ -2630,7 +2674,7 @@ dependencies = [ "reqwest", "reqwest-middleware", "simple_spawn_blocking", - "thiserror 2.0.8", + "thiserror 2.0.12", "tokio", "tracing", "url", @@ -2638,9 +2682,9 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.29.6" +version = "0.29.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13391d33d1511153902d8e512a5c84c1f4e84a389fcb6ad650e7909408cf544" +checksum = "d5f01db87a34cb9fc92d7be8a8789c79a567c8738a535f3cb79779a8580c33d6" dependencies = [ "chrono", "dirs", @@ -2668,7 +2712,7 @@ dependencies = [ "simd-json", "smallvec", "strum", - "thiserror 2.0.8", + "thiserror 2.0.12", "tracing", "typed-path", "url", @@ -2725,16 +2769,16 @@ dependencies = [ "retry-policies", "serde", "serde_json", - "thiserror 2.0.8", + "thiserror 2.0.12", "tracing", "url", ] [[package]] name = "rattler_package_streaming" -version = "0.22.19" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b7f8d479f3e1e9fe5eaa6ccb8cf296258f9d56cb0423baced7720fe9512e6b" +checksum = "24a505f4ed90ca9c4eed477d3184bc38621c5d2c334be28bcdde7f16e7c4ef0c" dependencies = [ "bzip2 0.5.0", "chrono", @@ -2750,7 +2794,7 @@ dependencies = [ "serde_json", "tar", "tempfile", - "thiserror 2.0.8", + "thiserror 2.0.12", "tokio", "tokio-util", "tracing", @@ -2772,9 +2816,9 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.21.28" +version = "0.21.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24b5beea6fbf6b76356e361897c919abc4bf7db706ae5f5868a24815f2ff711" +checksum = "9ef851fac32e22323c735e5eda2f966687902f595ab3d6f25cf28e2f89e16ced" dependencies = [ "anyhow", "async-compression", @@ -2800,7 +2844,7 @@ dependencies = [ "md-5", "memmap2", "ouroboros", - "parking_lot", + "parking_lot 0.12.3", "pin-project-lite", "rattler_cache", "rattler_conda_types", @@ -2816,7 +2860,7 @@ dependencies = [ "simple_spawn_blocking", "superslice", "tempfile", - "thiserror 2.0.8", + "thiserror 2.0.12", "tokio", "tokio-util", "tracing", @@ -2827,9 +2871,9 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.22.11" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06401300c3f5718abb5c3ed1c66f9837c5cac5879c33a440d6bf95f4336ba38d" +checksum = "39e4f21b5783b0ce087d816669a4539add1ce5c076050856e350435a9a27c61f" dependencies = [ "enum_dispatch", "fs-err", @@ -2839,7 +2883,7 @@ dependencies = [ "serde_json", "shlex", "tempfile", - "thiserror 2.0.8", + "thiserror 2.0.12", "tracing", ] @@ -2863,13 +2907,22 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_syscall" version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags", + "bitflags 2.6.0", ] [[package]] @@ -3006,6 +3059,28 @@ dependencies = [ "tower-service", ] +[[package]] +name = "reqwest-retry" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c73e4195a6bfbcb174b790d9b3407ab90646976c55de58a6515da25d851178" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "getrandom", + "http", + "hyper", + "parking_lot 0.11.2", + "reqwest", + "reqwest-middleware", + "retry-policies", + "thiserror 1.0.69", + "tokio", + "tracing", + "wasm-timer", +] + [[package]] name = "retry-policies" version = "0.4.0" @@ -3070,7 +3145,7 @@ version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ - "bitflags", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -3184,7 +3259,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags", + "bitflags 2.6.0", "core-foundation 0.9.4", "core-foundation-sys", "libc", @@ -3197,7 +3272,7 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" dependencies = [ - "bitflags", + "bitflags 2.6.0", "core-foundation 0.10.0", "core-foundation-sys", "libc", @@ -3256,9 +3331,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "indexmap 2.7.0", "itoa", @@ -3646,11 +3721,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.8" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.8", + "thiserror-impl 2.0.12", ] [[package]] @@ -3666,9 +3741,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.8" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", @@ -3751,7 +3826,7 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot", + "parking_lot 0.12.3", "pin-project-lite", "socket2", "tokio-macros", @@ -4129,6 +4204,21 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "web-sys" version = "0.3.72" @@ -4618,9 +4708,9 @@ dependencies = [ [[package]] name = "zip" -version = "2.2.2" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9c1ea7b3a5e1f4b922ff856a129881167511563dc219869afe3787fc0c1a45" +checksum = "84e9a772a54b54236b9b744aaaf8d7be01b4d6e99725523cb82cb32d1c81b1d7" dependencies = [ "arbitrary", "crc32fast", @@ -4629,7 +4719,7 @@ dependencies = [ "flate2", "indexmap 2.7.0", "memchr", - "thiserror 2.0.8", + "thiserror 2.0.12", "time", "zopfli", ]