diff --git a/Cargo.lock b/Cargo.lock index ae13f02..e1520a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,9 +121,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "arbitrary" @@ -535,9 +535,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.21" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", "clap_derive", @@ -545,9 +545,9 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54381ae56ad222eea3f529c692879e9c65e07945ae48d3dc4d1cb18dbec8cf44" +checksum = "2678fade3b77aa3a8ff3aae87e9c008d3fb00473a41c71fbf74e91c8c7b37e84" dependencies = [ "clap", "log", @@ -555,9 +555,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.21" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", @@ -579,9 +579,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "colorchoice" @@ -2621,9 +2621,9 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.29.3" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa6e2010c1a639982d9c22766598159dbeda9b5701ab01a863c66e55520c1ba1" +checksum = "f4fe3619a8d2903b0adfb2889fa58f906855fc5dd260c17d5a4dc2c447a701d1" dependencies = [ "chrono", "dirs", @@ -2657,9 +2657,9 @@ dependencies = [ [[package]] name = "rattler_digest" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a97526971dd357657ea4c88f6d39b31b2875c87dfe9fd12aac305fec6c0f60" +checksum = "8ffd5141cd51f0de194c8c05d97f138d2ea70274636ce911bbdf7dd371942a47" dependencies = [ "blake2", "digest", @@ -2688,9 +2688,9 @@ dependencies = [ [[package]] name = "rattler_lock" -version = "0.22.32" +version = "0.22.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8bddb02b5eb7bbf245438f1b5eb7feb44c0186bf7d8750b51c4cdf046e0dcff" +checksum = "9ad19fa576a01dc93352d6d883f57f900b71e9195925532c357377051ef8ac5f" dependencies = [ "chrono", "file_url", @@ -2723,9 +2723,9 @@ dependencies = [ [[package]] name = "rattler_networking" -version = "0.21.7" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01eaebf490a9057e0d2e0623a589573dc4c722e83f066b3ce6d50c2d185bae24" +checksum = "40f5ad1da789b5bbe9585b4d255f2df82c676a951e2f002a76bf9fa7389c4962" dependencies = [ "anyhow", "async-trait", @@ -2751,9 +2751,9 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.22.15" +version = "0.22.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4f0a36ab3dfdd75770abb9c8998a83df04b3917240f31896cad21d4739de3b" +checksum = "37e5d3a43c996a379bcc3c68bb8322d31baa11d6170f3746fc5667317cf10f8d" dependencies = [ "bzip2", "chrono", @@ -2791,9 +2791,9 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.22.8" +version = "0.22.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "070b851b93cd8973a6e9377c06323aca1d8faeeeb5b59f80f3cd1e2c8a7684bf" +checksum = "86d2b039c5e575929d91f62364cd84c13c115a705e4a4d634d852b77f1fcb5af" dependencies = [ "enum_dispatch", "fs-err 3.0.0", @@ -2919,9 +2919,9 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "reqwest" -version = "0.12.9" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" +checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ "async-compression", "base64 0.22.1", @@ -2959,6 +2959,7 @@ dependencies = [ "tokio-native-tls", "tokio-rustls", "tokio-util", + "tower", "tower-service", "url", "wasm-bindgen", @@ -3010,21 +3011,21 @@ dependencies = [ [[package]] name = "rstest" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2c585be59b6b5dd66a9d2084aa1d8bd52fbdb806eafdeffb52791147862035" +checksum = "03e905296805ab93e13c1ec3a03f4b6c4f35e9498a3d5fa96dc626d22c03cd89" dependencies = [ - "futures", "futures-timer", + "futures-util", "rstest_macros", "rustc_version", ] [[package]] name = "rstest_macros" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825ea780781b15345a146be27eaefb05085e337e869bff01b4306a4fd4a9ad5a" +checksum = "ef0053bbffce09062bee4bcc499b0fbe7a57b879f1efe088d6d8d4c7adcdef9b" dependencies = [ "cfg-if", "glob", @@ -3227,9 +3228,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.215" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -3257,9 +3258,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", @@ -3268,9 +3269,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "indexmap 2.6.0", "itoa", @@ -3726,9 +3727,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.1" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -3775,9 +3776,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -3829,6 +3830,27 @@ dependencies = [ "winnow", ] +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + [[package]] name = "tower-service" version = "0.3.3" diff --git a/Cargo.toml b/Cargo.toml index c2e47aa..bbc62f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,30 +22,30 @@ rustls-tls = [ ] [dependencies] -anyhow = "1.0.93" -clap = { version = "4.5.21", features = ["derive", "string"] } -clap-verbosity-flag = "3.0.1" +anyhow = "1.0.95" +clap = { version = "4.5.23", features = ["derive", "string"] } +clap-verbosity-flag = "3.0.2" futures = "0.3.31" indicatif = "0.17.9" rattler = { version = "0.28.4", default-features = false } -rattler_digest = "1.0.3" -rattler_conda_types = "0.29.3" +rattler_digest = "1.0.4" +rattler_conda_types = "0.29.5" rattler_index = "0.19.37" -rattler_lock = "0.22.32" -rattler_networking = { version = "0.21.7", default-features = false } -rattler_package_streaming = { version = "0.22.15", default-features = false } -rattler_shell = "0.22.8" -reqwest = { version = "0.12.9", default-features = false, features = [ +rattler_lock = "0.22.34" +rattler_networking = { version = "0.21.8", default-features = false } +rattler_package_streaming = { version = "0.22.18", default-features = false } +rattler_shell = "0.22.10" +reqwest = { version = "0.12.12", default-features = false, features = [ "http2", "macos-system-configuration", ] } reqwest-middleware = "0.4.0" serde = { version = "1.0.215", features = ["derive"] } -serde_json = "1.0.133" +serde_json = "1.0.134" serde_yaml = "0.9.34" tokio-tar = "0.3.1" -tokio = { version = "1.41.1", features = ["rt-multi-thread"] } -tokio-stream = { version = "0.1.16", features = ["fs"] } +tokio = { version = "1.42.0", features = ["rt-multi-thread"] } +tokio-stream = { version = "0.1.17", features = ["fs"] } tracing = "0.1.41" tracing-subscriber = { version = "0.3.19", features = [ "default", @@ -60,6 +60,6 @@ base64 = "0.22.1" [dev-dependencies] async-std = "1.13.0" -rstest = "0.23.0" +rstest = "0.24.0" sha2 = "0.10.8" insta = "1.41.1"