diff --git a/Cargo.lock b/Cargo.lock index 8691037ab7..a278ec8b05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2" dependencies = [ "concurrent-queue", "event-listener-strategy", @@ -418,9 +418,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.94.0" +version = "1.96.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc24d9d761bd464534d9e477a9f724c118ca2557a95444097cf6ce71f3229a72" +checksum = "6e25d24de44b34dcdd5182ac4e4c6f07bcec2661c505acef94c0d293b65505fe" dependencies = [ "aws-credential-types", "aws-runtime", @@ -452,9 +452,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.73.0" +version = "1.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac1674cba7872061a29baaf02209fefe499ff034dfd91bd4cc59e4d7741489" +checksum = "e0a69de9c1b9272da2872af60c7402683e7f45c06267735b4332deacb203239b" dependencies = [ "aws-credential-types", "aws-runtime", @@ -474,9 +474,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.74.0" +version = "1.75.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6a22f077f5fd3e3c0270d4e1a110346cddf6769e9433eb9e6daceb4ca3b149" +checksum = "f0b161d836fac72bdd5ac1a4cd1cdc38ab888c7af26cfd95f661be4409505e63" dependencies = [ "aws-credential-types", "aws-runtime", @@ -496,9 +496,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.75.0" +version = "1.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3258fa707f2f585ee3049d9550954b959002abd59176975150a01d5cf38ae3f" +checksum = "cb1cd79a3412751a341a28e2cd0d6fa4345241976da427b075a0c0cd5409f886" dependencies = [ "aws-credential-types", "aws-runtime", @@ -961,9 +961,9 @@ dependencies = [ [[package]] name = "blocking" -version = "1.6.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" dependencies = [ "async-channel", "async-task", @@ -1267,19 +1267,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "console" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e09ced7ebbccb63b4c65413d821f2e00ce54c5ca4514ddc6b3c892fdbcbc69d" -dependencies = [ - "encode_unicode", - "libc", - "once_cell", - "unicode-width", - "windows-sys 0.60.2", -] - [[package]] name = "const-oid" version = "0.9.6" @@ -2626,9 +2613,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" +checksum = "7f66d5bd4c6f02bf0542fad85d626775bab9258cf795a4256dcaf3161114d1df" dependencies = [ "base64 0.22.1", "bytes", @@ -2811,14 +2798,14 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.12" +version = "0.17.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4adb2ee6ad319a912210a36e56e3623555817bcc877a7e6e8802d1d69c4d8056" +checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" dependencies = [ - "console 0.16.0", + "console", + "number_prefix", "portable-atomic", "unicode-width", - "unit-prefix", "web-time", ] @@ -2838,7 +2825,7 @@ version = "1.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "154934ea70c58054b556dd430b99a98c2a7ff5309ac9891597e339b5c28f4371" dependencies = [ - "console 0.15.11", + "console", "globset", "once_cell", "pest", @@ -2862,6 +2849,17 @@ dependencies = [ "web-sys", ] +[[package]] +name = "io-uring" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013" +dependencies = [ + "bitflags 2.9.1", + "cfg-if", + "libc", +] + [[package]] name = "ipnet" version = "2.11.0" @@ -3426,6 +3424,12 @@ dependencies = [ "libc", ] +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + [[package]] name = "objc2-core-foundation" version = "0.3.1" @@ -3492,7 +3496,7 @@ dependencies = [ "log", "md-5", "percent-encoding", - "quick-xml", + "quick-xml 0.37.5", "reqsign", "reqwest", "serde", @@ -3869,13 +3873,13 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "plist" -version = "1.7.2" +version = "1.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d77244ce2d584cd84f6a15f86195b8c9b2a0dfbfd817c09e0464244091a58ed" +checksum = "3af6b589e163c5a788fab00ce0c0366f6efbb9959c2f9874b224936af7fce7e1" dependencies = [ "base64 0.22.1", "indexmap 2.10.0", - "quick-xml", + "quick-xml 0.38.0", "serde", "time", ] @@ -4006,6 +4010,15 @@ dependencies = [ "serde", ] +[[package]] +name = "quick-xml" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8927b0664f5c5a98265138b7e3f90aa19a6b21353182469ace36d4ac527b7b1b" +dependencies = [ + "memchr", +] + [[package]] name = "quinn" version = "0.11.8" @@ -4177,7 +4190,7 @@ dependencies = [ "assert_matches", "axum", "clap", - "console 0.15.11", + "console", "digest", "dirs", "fs-err", @@ -4227,7 +4240,7 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", - "console 0.15.11", + "console", "indicatif", "itertools 0.14.0", "once_cell", @@ -4336,7 +4349,7 @@ dependencies = [ name = "rattler_config" version = "0.2.1" dependencies = [ - "console 0.15.11", + "console", "fs-err", "indexmap 2.10.0", "insta", @@ -4371,14 +4384,14 @@ dependencies = [ [[package]] name = "rattler_index" -version = "0.24.2" +version = "0.24.3" dependencies = [ "anyhow", "bytes", "chrono", "clap", "clap-verbosity-flag", - "console 0.15.11", + "console", "fs-err", "futures", "fxhash", @@ -4465,7 +4478,7 @@ dependencies = [ "known-folders", "once_cell", "plist", - "quick-xml", + "quick-xml 0.37.5", "rattler_conda_types", "rattler_shell", "regex", @@ -4572,7 +4585,7 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.23.5" +version = "0.23.6" dependencies = [ "anyhow", "assert_matches", @@ -4885,7 +4898,7 @@ dependencies = [ "http 1.3.1", "log", "percent-encoding", - "quick-xml", + "quick-xml 0.37.5", "rand 0.8.5", "reqwest", "rust-ini", @@ -4898,9 +4911,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.21" +version = "0.12.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8cea6b35bcceb099f30173754403d2eba0a5dc18cea3630fccd88251909288" +checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531" dependencies = [ "async-compression", "base64 0.22.1", @@ -5102,13 +5115,12 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f" +checksum = "e7295b7ce3bf4806b419dc3420745998b447178b7005e2011947b38fc5aa6791" dependencies = [ "cfg-if", "ordered-multimap", - "trim-in-place", ] [[package]] @@ -5302,9 +5314,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1375ba8ef45a6f15d83fa8748f1079428295d403d6ea991d09ab100155fbc06d" +checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" dependencies = [ "dyn-clone", "ref-cast", @@ -5516,7 +5528,7 @@ dependencies = [ "indexmap 1.9.3", "indexmap 2.10.0", "schemars 0.9.0", - "schemars 1.0.3", + "schemars 1.0.4", "serde", "serde_derive", "serde_json", @@ -5658,7 +5670,7 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5b441962c817e33508847a22bd82f03a30cff43642dc2fae8b050566121eb9a" dependencies = [ - "console 0.15.11", + "console", "similar", ] @@ -6053,17 +6065,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.45.1" +version = "1.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" +checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17" dependencies = [ "backtrace", "bytes", + "io-uring", "libc", "mio", "parking_lot 0.12.4", "pin-project-lite", "signal-hook-registry", + "slab", "socket2", "tokio-macros", "windows-sys 0.52.0", @@ -6341,12 +6355,6 @@ dependencies = [ "syn", ] -[[package]] -name = "trim-in-place" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" - [[package]] name = "try-lock" version = "0.2.5" @@ -6437,12 +6445,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c" -[[package]] -name = "unit-prefix" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "323402cff2dd658f39ca17c789b502021b3f18707c91cdf22e3838e1b4023817" - [[package]] name = "unsafe-libyaml" version = "0.2.11" diff --git a/Cargo.toml b/Cargo.toml index 1885774c13..afca5df938 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -188,7 +188,7 @@ rattler_cache = { path = "crates/rattler_cache", version = "=0.3.24", default-fe rattler_conda_types = { path = "crates/rattler_conda_types", version = "=0.35.4", default-features = false } rattler_config = { path = "crates/rattler_config", version = "=0.2.1", default-features = false } rattler_digest = { path = "crates/rattler_digest", version = "=1.1.4", default-features = false } -rattler_index = { path = "crates/rattler_index", version = "=0.24.2", default-features = false } +rattler_index = { path = "crates/rattler_index", version = "=0.24.3", default-features = false } rattler_libsolv_c = { path = "crates/rattler_libsolv_c", version = "=1.2.3", default-features = false } rattler_lock = { path = "crates/rattler_lock", version = "=0.23.9", default-features = false } rattler_macros = { path = "crates/rattler_macros", version = "=1.0.11", default-features = false } @@ -197,7 +197,7 @@ rattler_networking = { path = "crates/rattler_networking", version = "=0.25.4", rattler_pty = { path = "crates/rattler_pty", version = "=0.2.4", default-features = false } rattler_redaction = { path = "crates/rattler_redaction", version = "=0.1.12", default-features = false } rattler_package_streaming = { path = "crates/rattler_package_streaming", version = "=0.22.43", default-features = false } -rattler_repodata_gateway = { path = "crates/rattler_repodata_gateway", version = "=0.23.5", default-features = false } +rattler_repodata_gateway = { path = "crates/rattler_repodata_gateway", version = "=0.23.6", default-features = false } rattler_sandbox = { path = "crates/rattler_sandbox", version = "=0.1.10", default-features = false } rattler_shell = { path = "crates/rattler_shell", version = "=0.24.2", default-features = false } rattler_solve = { path = "crates/rattler_solve", version = "=2.1.4", default-features = false } diff --git a/crates/rattler_index/CHANGELOG.md b/crates/rattler_index/CHANGELOG.md index 84aedcd1eb..24588ae973 100644 --- a/crates/rattler_index/CHANGELOG.md +++ b/crates/rattler_index/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.24.3](https://github.com/conda/rattler/compare/rattler_index-v0.24.2...rattler_index-v0.24.3) - 2025-07-08 + +### Other + +- update Cargo.lock dependencies + ## [0.24.2](https://github.com/conda/rattler/compare/rattler_index-v0.24.1...rattler_index-v0.24.2) - 2025-07-01 ### Fixed diff --git a/crates/rattler_index/Cargo.toml b/crates/rattler_index/Cargo.toml index 5000276483..1b85349935 100644 --- a/crates/rattler_index/Cargo.toml +++ b/crates/rattler_index/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rattler_index" -version = "0.24.2" +version = "0.24.3" edition.workspace = true authors = [] description = "A crate to index conda channels and create a repodata.json file." diff --git a/crates/rattler_repodata_gateway/CHANGELOG.md b/crates/rattler_repodata_gateway/CHANGELOG.md index 291f633e58..7c73f545c6 100644 --- a/crates/rattler_repodata_gateway/CHANGELOG.md +++ b/crates/rattler_repodata_gateway/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.23.6](https://github.com/conda/rattler/compare/rattler_repodata_gateway-v0.23.5...rattler_repodata_gateway-v0.23.6) - 2025-07-08 + +### Added + +- implement config conversion for repodata_gateway ([#1498](https://github.com/conda/rattler/pull/1498)) + ## [0.23.5](https://github.com/conda/rattler/compare/rattler_repodata_gateway-v0.23.4...rattler_repodata_gateway-v0.23.5) - 2025-07-01 ### Added diff --git a/crates/rattler_repodata_gateway/Cargo.toml b/crates/rattler_repodata_gateway/Cargo.toml index 22f159a925..6027e1dd0c 100644 --- a/crates/rattler_repodata_gateway/Cargo.toml +++ b/crates/rattler_repodata_gateway/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rattler_repodata_gateway" -version = "0.23.5" +version = "0.23.6" edition.workspace = true authors = ["Bas Zalmstra "] description = "A crate to interact with Conda repodata"