From 72f6e43641303da5ef009a4bbf9973171bdd3b46 Mon Sep 17 00:00:00 2001 From: Tim de Jager Date: Tue, 26 Nov 2024 14:32:49 +0100 Subject: [PATCH 1/2] feat: upgrade reqwest middleware --- Cargo.lock | 23 ++++++++++++++------- crates/rattler_installs_packages/Cargo.toml | 4 ++-- crates/rip_bin/Cargo.toml | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 55ba65e..719608d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -177,14 +177,14 @@ dependencies = [ [[package]] name = "async_http_range_reader" -version = "0.7.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8561e6613f8361df8bed11c0eef05b98384643bc81f6b753eec7c1d91f097509" +checksum = "2b537c00269e3f943e06f5d7cabf8ccd281b800fd0c7f111dd82f77154334197" dependencies = [ "bisection", "futures", "http-content-range", - "itertools 0.12.1", + "itertools 0.13.0", "memmap2 0.9.4", "reqwest", "reqwest-middleware", @@ -1226,9 +1226,9 @@ dependencies = [ [[package]] name = "http-content-range" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0d1a8ef218a86416107794b34cc446958d9203556c312bb41eab4c924c1d2e" +checksum = "91314cc9d86f625097a3365cab4e4b6f190eac231650f8f41c1edd8080cea1d0" [[package]] name = "http-serde" @@ -1492,6 +1492,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.10" @@ -2396,9 +2405,9 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209efb52486ad88136190094ee214759ef7507068b27992256ed6610eb71a01" +checksum = "d1ccd3b55e711f91a9885a2fa6fbbb2e39db1776420b062efc058c6410f7e5e3" dependencies = [ "anyhow", "async-trait", diff --git a/crates/rattler_installs_packages/Cargo.toml b/crates/rattler_installs_packages/Cargo.toml index fa2baca..d0c4403 100644 --- a/crates/rattler_installs_packages/Cargo.toml +++ b/crates/rattler_installs_packages/Cargo.toml @@ -45,7 +45,7 @@ pin-project-lite = "0.2.14" rattler_digest = { version = "0.19.3", features = ["serde"] } regex = "1.10.4" reqwest = { version = "0.12.3", default-features = false, features = ["json", "stream"] } -reqwest-middleware = "0.3.0" +reqwest-middleware = "0.4.0" serde = "1.0.198" serde_json = "1.0.116" serde_with = "3.7.0" @@ -70,7 +70,7 @@ cacache = { version = "13.0.0", default-features = false, features = ["tokio-run async-recursion = "1.1.0" fs-err = "2.11.0" fs_extra = "1.3.0" -async_http_range_reader = "0.7.1" +async_http_range_reader = "0.9.1" which = "6.0.1" [dev-dependencies] diff --git a/crates/rip_bin/Cargo.toml b/crates/rip_bin/Cargo.toml index 83eab92..bb6f9fa 100644 --- a/crates/rip_bin/Cargo.toml +++ b/crates/rip_bin/Cargo.toml @@ -30,7 +30,7 @@ itertools = "0.12.1" miette = { version = "7.2.0", features = ["fancy"] } rattler_installs_packages = { path = "../rattler_installs_packages", default-features = false } reqwest = { version = "0.12.3", default-features = false } -reqwest-middleware = "0.3.0" +reqwest-middleware = "0.4.0" tabwriter = { version = "1.4.0", features = ["ansi_formatting"] } tokio = { version = "1.37.0", features = ["rt", "macros", "rt-multi-thread"] } tracing = "0.1.40" From e18cba1254792d0830d0637efc6919161c0d7b0f Mon Sep 17 00:00:00 2001 From: Tim de Jager Date: Tue, 26 Nov 2024 14:47:20 +0100 Subject: [PATCH 2/2] feat: commit snap --- ...ackages__artifacts__sdist__tests__zip_timestamps_1980.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/rattler_installs_packages/src/artifacts/snapshots/rattler_installs_packages__artifacts__sdist__tests__zip_timestamps_1980.snap b/crates/rattler_installs_packages/src/artifacts/snapshots/rattler_installs_packages__artifacts__sdist__tests__zip_timestamps_1980.snap index f17d355..6eb8ee8 100644 --- a/crates/rattler_installs_packages/src/artifacts/snapshots/rattler_installs_packages__artifacts__sdist__tests__zip_timestamps_1980.snap +++ b/crates/rattler_installs_packages/src/artifacts/snapshots/rattler_installs_packages__artifacts__sdist__tests__zip_timestamps_1980.snap @@ -25,7 +25,7 @@ Ok( 32, 50, 46, - 49, + 51, 10, 78, 97, @@ -8903,7 +8903,7 @@ Ok( epoch: 0, release: [ 2, - 1, + 3, ], pre: None, post: None,