diff --git a/Cargo.toml b/Cargo.toml index 613163faa..f5cf9ba64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ axum = { version = "0.8.1", default-features = false, features = [ base64 = "0.22.1" bindgen = "0.71.1" blake2 = "0.10.6" -bytes = "1.10.0" +bytes = "1.10.1" bzip2 = "0.5.2" cache_control = "0.2.0" cfg-if = "1.0" @@ -73,12 +73,12 @@ getrandom = { version = "0.3.1", default-features = false } glob = "0.3.2" google-cloud-auth = { version = "0.17.2", default-features = false } google-cloud-token = "0.1.2" -aws-config = { version = "1.5.16", default-features = false, features = [ +aws-config = { version = "1.5.18", default-features = false, features = [ "rt-tokio", "rustls", "sso", ] } -aws-sdk-s3 = { version = "1.75.0", default-features = false, features = [ +aws-sdk-s3 = { version = "1.78.0", default-features = false, features = [ "rt-tokio", "rustls", "sigv4a", @@ -118,7 +118,7 @@ purl = { version = "0.1.5", features = ["serde"] } quote = "1.0.39" rand = "0.9.0" rayon = "1.10.0" -reflink-copy = "0.1.23" +reflink-copy = "0.1.25" regex = "1.11.1" reqwest = { version = "0.12.12", default-features = false } reqwest-middleware = "0.4.1" @@ -130,7 +130,7 @@ rstest = { version = "0.24.0" } rstest_reuse = "0.7.0" simd-json = { version = "0.14.3", features = ["serde_impl"] } self_cell = "1.1.0" -serde = { version = "1.0.218" } +serde = { version = "1.0.219" } serde_json = { version = "1.0.140" } serde_repr = "0.1" serde-value = "0.7.0" @@ -148,15 +148,15 @@ smallvec = { version = "1.14.0", features = [ ] } strum = { version = "0.27.0", features = ["derive"] } superslice = "1.0.0" -syn = "2.0.99" +syn = "2.0.100" sysinfo = "0.33.1" tar = "0.4.44" tempdir = "0.3.7" -tempfile = "3.16.0" +tempfile = "3.18.0" temp-env = { version = "0.3.6", features = ["async_closure"] } test-log = "0.2.17" thiserror = "2.0" -tokio = { version = "1.43.0", default-features = false } +tokio = { version = "1.44.0", default-features = false } tokio-stream = "0.1.17" tokio-util = "0.7.13" tower = { version = "0.5.2", default-features = false } diff --git a/py-rattler/Cargo.lock b/py-rattler/Cargo.lock index 7fb544f30..80888f5b7 100644 --- a/py-rattler/Cargo.lock +++ b/py-rattler/Cargo.lock @@ -212,7 +212,7 @@ dependencies = [ "async-trait", "cfg-if", "pin-project", - "rustix", + "rustix 0.38.44", "thiserror 1.0.69", "tokio", "windows-sys 0.52.0", @@ -242,7 +242,7 @@ dependencies = [ "futures-lite", "parking", "polling", - "rustix", + "rustix 0.38.44", "slab", "tracing", "windows-sys 0.59.0", @@ -274,7 +274,7 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix", + "rustix 0.38.44", "tracing", ] @@ -301,7 +301,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix", + "rustix 0.38.44", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -338,9 +338,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-config" -version = "1.5.17" +version = "1.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490aa7465ee685b2ced076bb87ef654a47724a7844e2c7d3af4e749ce5b875dd" +checksum = "90aff65e86db5fe300752551c1b015ef72b708ac54bded8ef43d0d53cb7cb0b1" dependencies = [ "aws-credential-types", "aws-runtime", @@ -348,7 +348,7 @@ dependencies = [ "aws-sdk-ssooidc", "aws-sdk-sts", "aws-smithy-async", - "aws-smithy-http", + "aws-smithy-http 0.61.1", "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", @@ -388,7 +388,7 @@ dependencies = [ "aws-sigv4", "aws-smithy-async", "aws-smithy-eventstream", - "aws-smithy-http", + "aws-smithy-http 0.60.12", "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", @@ -406,9 +406,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.77.0" +version = "1.78.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e87342432a3de0e94e82c99a7cbd9042f99de029ae1f4e368160f9e9929264" +checksum = "3038614b6cf7dd68d9a7b5b39563d04337eb3678d1d4173e356e927b0356158a" dependencies = [ "aws-credential-types", "aws-runtime", @@ -416,7 +416,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-checksums", "aws-smithy-eventstream", - "aws-smithy-http", + "aws-smithy-http 0.61.1", "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", @@ -440,14 +440,14 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.60.0" +version = "1.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60186fab60b24376d3e33b9ff0a43485f99efd470e3b75a9160c849741d63d56" +checksum = "e65ff295979977039a25f5a0bf067a64bc5e6aa38f3cef4037cf42516265553c" dependencies = [ "aws-credential-types", "aws-runtime", "aws-smithy-async", - "aws-smithy-http", + "aws-smithy-http 0.61.1", "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", @@ -462,14 +462,14 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.61.0" +version = "1.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7033130ce1ee13e6018905b7b976c915963755aef299c1521897679d6cd4f8ef" +checksum = "91430a60f754f235688387b75ee798ef00cfd09709a582be2b7525ebb5306d4f" dependencies = [ "aws-credential-types", "aws-runtime", "aws-smithy-async", - "aws-smithy-http", + "aws-smithy-http 0.61.1", "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", @@ -484,14 +484,14 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.61.0" +version = "1.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5c1cac7677179d622b4448b0d31bcb359185295dc6fca891920cfb17e2b5156" +checksum = "9276e139d39fff5a0b0c984fc2d30f970f9a202da67234f948fda02e5bea1dbe" dependencies = [ "aws-credential-types", "aws-runtime", "aws-smithy-async", - "aws-smithy-http", + "aws-smithy-http 0.61.1", "aws-smithy-json", "aws-smithy-query", "aws-smithy-runtime", @@ -513,7 +513,7 @@ checksum = "9bfe75fad52793ce6dec0dc3d4b1f388f038b5eb866c8d4d7f3a8e21b5ea5051" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", - "aws-smithy-http", + "aws-smithy-http 0.60.12", "aws-smithy-runtime-api", "aws-smithy-types", "bytes", @@ -551,7 +551,7 @@ version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db2dc8d842d872529355c72632de49ef8c5a2949a4472f10e802f28cf925770c" dependencies = [ - "aws-smithy-http", + "aws-smithy-http 0.60.12", "aws-smithy-types", "bytes", "crc32c", @@ -569,9 +569,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.60.6" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b18559a41e0c909b77625adf2b8c50de480a8041e5e4a3f5f7d177db70abc5a" +checksum = "461e5e02f9864cba17cff30f007c2e37ade94d01e87cdb5204e44a84e6d38c17" dependencies = [ "aws-smithy-types", "bytes", @@ -583,6 +583,26 @@ name = "aws-smithy-http" version = "0.60.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7809c27ad8da6a6a68c454e651d4962479e81472aa19ae99e59f9aba1f9713cc" +dependencies = [ + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http-body 0.4.6", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-http" +version = "0.61.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6f276f21c7921fe902826618d1423ae5bf74cf8c1b8472aee8434f3dfd31824" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -625,7 +645,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d526a12d9ed61fadefda24abe2e682892ba288c2018bcb38b1b4c111d13f6d92" dependencies = [ "aws-smithy-async", - "aws-smithy-http", + "aws-smithy-http 0.60.12", "aws-smithy-runtime-api", "aws-smithy-types", "bytes", @@ -858,9 +878,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "bytes-utils" @@ -1690,7 +1710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c29c30684418547d476f0b48e84f4821639119c483b1eccd566c8cd0cd05f521" dependencies = [ "fs-err", - "rustix", + "rustix 0.38.44", "tokio", "windows-sys 0.52.0", ] @@ -2720,6 +2740,12 @@ version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +[[package]] +name = "linux-raw-sys" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9" + [[package]] name = "litemap" version = "0.7.5" @@ -3374,7 +3400,7 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix", + "rustix 0.38.44", "tracing", "windows-sys 0.59.0", ] @@ -3455,7 +3481,7 @@ dependencies = [ "pep508_rs", "pyo3", "pyo3-async-runtimes", - "pyo3-build-config", + "pyo3-build-config 0.24.0", "pyo3-file", "rattler", "rattler_conda_types", @@ -3490,7 +3516,7 @@ dependencies = [ "memoffset", "once_cell", "portable-atomic", - "pyo3-build-config", + "pyo3-build-config 0.23.5", "pyo3-ffi", "pyo3-macros", "unindent", @@ -3516,7 +3542,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb" dependencies = [ "once_cell", - "target-lexicon", + "target-lexicon 0.12.16", +] + +[[package]] +name = "pyo3-build-config" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9b6c2b34cf71427ea37c7001aefbaeb85886a074795e35f161f5aecc7620a7a" +dependencies = [ + "once_cell", + "target-lexicon 0.13.2", ] [[package]] @@ -3526,7 +3562,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d" dependencies = [ "libc", - "pyo3-build-config", + "pyo3-build-config 0.23.5", ] [[package]] @@ -3559,7 +3595,7 @@ checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028" dependencies = [ "heck", "proc-macro2", - "pyo3-build-config", + "pyo3-build-config 0.23.5", "quote", "syn", ] @@ -3732,7 +3768,7 @@ dependencies = [ [[package]] name = "rattler" -version = "0.32.3" +version = "0.32.4" dependencies = [ "anyhow", "console", @@ -3773,7 +3809,7 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.3.12" +version = "0.3.13" dependencies = [ "anyhow", "dashmap", @@ -3803,7 +3839,7 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.31.2" +version = "0.31.3" dependencies = [ "chrono", "dirs", @@ -3855,7 +3891,7 @@ dependencies = [ [[package]] name = "rattler_index" -version = "0.21.1" +version = "0.21.2" dependencies = [ "anyhow", "bytes", @@ -3912,7 +3948,7 @@ dependencies = [ [[package]] name = "rattler_menuinst" -version = "0.2.1" +version = "0.2.2" dependencies = [ "chrono", "configparser", @@ -3940,7 +3976,7 @@ dependencies = [ [[package]] name = "rattler_networking" -version = "0.22.7" +version = "0.22.8" dependencies = [ "anyhow", "async-trait", @@ -3969,7 +4005,7 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.22.31" +version = "0.22.32" dependencies = [ "bzip2", "chrono", @@ -3997,7 +4033,7 @@ dependencies = [ [[package]] name = "rattler_redaction" -version = "0.1.7" +version = "0.1.8" dependencies = [ "reqwest", "reqwest-middleware", @@ -4006,7 +4042,7 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.21.40" +version = "0.22.0" dependencies = [ "anyhow", "async-compression", @@ -4077,7 +4113,7 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "1.3.11" +version = "1.4.0" dependencies = [ "chrono", "futures", @@ -4171,13 +4207,13 @@ dependencies = [ [[package]] name = "reflink-copy" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9efd944f26afa2406cbbabff39fac533c9bc24b13d7f1f12e14ae3e7bdc66cdb" +checksum = "4b86038e146b9a61557e1a2e58cdf2eddc0b46ce141b55541b1c1b9f3189d618" dependencies = [ "cfg-if", "libc", - "rustix", + "rustix 1.0.1", "windows 0.60.0", ] @@ -4441,7 +4477,20 @@ dependencies = [ "bitflags", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dade4812df5c384711475be5fcd8c162555352945401aed22a35bffeab61f657" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys 0.9.2", "windows-sys 0.59.0", ] @@ -4681,9 +4730,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -4711,9 +4760,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -4735,9 +4784,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", @@ -5025,9 +5074,9 @@ checksum = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" [[package]] name = "syn" -version = "2.0.99" +version = "2.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ "proc-macro2", "quote", @@ -5112,17 +5161,23 @@ version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +[[package]] +name = "target-lexicon" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" + [[package]] name = "tempfile" -version = "3.17.1" +version = "3.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230" +checksum = "2c317e0a526ee6120d8dabad239c8dadca62b24b6f168914bbbc8e2fb1f0e567" dependencies = [ "cfg-if", "fastrand", "getrandom 0.3.1", "once_cell", - "rustix", + "rustix 1.0.1", "windows-sys 0.59.0", ] @@ -5243,9 +5298,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.43.0" +version = "1.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" +checksum = "9975ea0f48b5aa3972bf2d888c238182458437cc2a19374b81b25cdf1023fb3a" dependencies = [ "backtrace", "bytes", @@ -5771,7 +5826,7 @@ checksum = "2774c861e1f072b3aadc02f8ba886c26ad6321567ecc294c935434cad06f1283" dependencies = [ "either", "env_home", - "rustix", + "rustix 0.38.44", "winsafe", ] @@ -6211,8 +6266,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909" dependencies = [ "libc", - "linux-raw-sys", - "rustix", + "linux-raw-sys 0.4.15", + "rustix 0.38.44", ] [[package]] diff --git a/py-rattler/Cargo.toml b/py-rattler/Cargo.toml index e79e21a07..48ad75965 100644 --- a/py-rattler/Cargo.toml +++ b/py-rattler/Cargo.toml @@ -55,7 +55,7 @@ pyo3 = { version = "0.23.5", features = [ "chrono", ] } pyo3-async-runtimes = { version = "0.23.0", features = ["tokio-runtime"] } -tokio = { version = "1.43" } +tokio = { version = "1.44" } reqwest = { version = "0.12.12", default-features = false } reqwest-middleware = "0.4.1" @@ -69,7 +69,7 @@ serde_json = "1.0.140" pyo3-file = "0.10.0" [build-dependencies] -pyo3-build-config = "0.23.5" +pyo3-build-config = "0.24.0" [patch.crates-io]