diff --git a/Cargo.lock b/Cargo.lock index 06a347423..de9028e2e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -58,9 +58,9 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" [[package]] name = "allocator-api2" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android-tzdata" @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "arbitrary" @@ -206,9 +206,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857" +checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" dependencies = [ "bzip2", "flate2", @@ -544,9 +544,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "bzip2" @@ -571,9 +571,9 @@ dependencies = [ [[package]] name = "cacache" -version = "13.0.0" +version = "13.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61ff12b19d89c752c213316b87fdb4a587f073d219b893cc56974b8c9f39bf7" +checksum = "5c5063741c7b2e260bbede781cf4679632dd90e2718e99f7715e46824b65670b" dependencies = [ "digest", "either", @@ -628,9 +628,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.1" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d" dependencies = [ "jobserver", "libc", @@ -651,9 +651,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -703,9 +703,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", @@ -713,9 +713,9 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "2.2.3" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c77f67047557f62582784fd7482884697731b2932c7d37ced54bce2312e1e2" +checksum = "54381ae56ad222eea3f529c692879e9c65e07945ae48d3dc4d1cb18dbec8cf44" dependencies = [ "clap", "log", @@ -723,9 +723,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", @@ -766,9 +766,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" @@ -873,9 +873,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -1254,12 +1254,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1275,9 +1275,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ "event-listener", "pin-project-lite", @@ -1285,14 +1285,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "file_url" -version = "0.1.7" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2789b7b3e160530d89d1e126aff9811c3421bb77ebb9b62ffa3abbeba69f12d" dependencies = [ "itertools 0.13.0", "percent-encoding", @@ -1616,9 +1617,9 @@ dependencies = [ [[package]] name = "google-cloud-auth" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357160f51a60ec3e32169ad687f4abe0ee1e90c73b449aa5d11256c4f1cf2ff6" +checksum = "e57a13fbacc5e9c41ded3ad8d0373175a6b7a6ad430d99e89d314ac121b7ab06" dependencies = [ "async-trait", "base64 0.21.7", @@ -1668,7 +1669,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.6.0", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -1713,9 +1714,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "allocator-api2", "equivalent", @@ -1811,9 +1812,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -2183,12 +2184,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "serde", ] @@ -2287,9 +2288,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jobserver" @@ -2302,10 +2303,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -2393,9 +2395,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.164" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libdbus-sys" @@ -2408,9 +2410,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", "windows-targets 0.52.6", @@ -2447,9 +2449,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" @@ -2479,7 +2481,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.1", + "hashbrown 0.15.2", ] [[package]] @@ -2570,19 +2572,19 @@ dependencies = [ [[package]] name = "miette" -version = "7.2.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" +checksum = "317f146e2eb7021892722af37cf1b971f0a70c8406f487e24952667616192c64" dependencies = [ "backtrace", "backtrace-ext", "cfg-if", - "miette-derive 7.2.0", + "miette-derive 7.4.0", "owo-colors", "supports-color", "supports-hyperlinks", "supports-unicode", - "terminal_size 0.3.0", + "terminal_size", "textwrap", "thiserror 1.0.69", "unicode-width 0.1.14", @@ -2601,9 +2603,9 @@ dependencies = [ [[package]] name = "miette-derive" -version = "7.2.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" +checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67" dependencies = [ "proc-macro2", "quote", @@ -2653,11 +2655,10 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "log", "wasi", @@ -3016,9 +3017,9 @@ dependencies = [ [[package]] name = "pathdiff" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" [[package]] name = "pbkdf2" @@ -3110,7 +3111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.6.0", + "indexmap 2.7.0", ] [[package]] @@ -3219,7 +3220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ "base64 0.22.1", - "indexmap 2.6.0", + "indexmap 2.7.0", "quick-xml", "serde", "time", @@ -3242,9 +3243,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "powerfmt" @@ -3282,9 +3283,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.91" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307e3004becf10f5a6e0d59d20f3cd28231b0e0827a96cd3e0ce6d14bc1e4bb3" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -3323,7 +3324,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95c3dd745f99aa3c554b7bb00859f7d18c2f1d6afd749ccc86d60b61e702abd9" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "pep440_rs", "pep508_rs", "serde", @@ -3352,7 +3353,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.3", + "thiserror 2.0.6", "tokio", "tracing", ] @@ -3371,7 +3372,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.3", + "thiserror 2.0.6", "tinyvec", "tracing", "web-time", @@ -3379,9 +3380,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" +checksum = "52cd4b1eff68bf27940dd39811292c49e007f4d0b4c357358dc9b0197be6b527" dependencies = [ "cfg_aliases", "libc", @@ -3459,8 +3460,9 @@ dependencies = [ [[package]] name = "rattler" -version = "0.28.3" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238dd1b6ca1f2e622e438092e6523a37c6b018e25b236406a6aa182d13885b39" dependencies = [ "anyhow", "clap", @@ -3470,7 +3472,7 @@ dependencies = [ "fs-err 3.0.0", "futures", "humantime", - "indexmap 2.6.0", + "indexmap 2.7.0", "indicatif", "itertools 0.13.0", "memchr", @@ -3499,7 +3501,7 @@ dependencies = [ [[package]] name = "rattler-build" -version = "0.31.1" +version = "0.32.0" dependencies = [ "ansi-to-tui", "anyhow", @@ -3524,7 +3526,7 @@ dependencies = [ "goblin", "hex", "ignore", - "indexmap 2.6.0", + "indexmap 2.7.0", "indicatif", "insta", "itertools 0.13.0", @@ -3532,7 +3534,7 @@ dependencies = [ "marked-yaml", "memchr", "memmap2 0.9.5", - "miette 7.2.0", + "miette 7.4.0", "minijinja", "num_cpus", "patch", @@ -3569,8 +3571,8 @@ dependencies = [ "spdx", "tar", "tempfile", - "terminal_size 0.4.0", - "thiserror 2.0.3", + "terminal_size", + "thiserror 2.0.6", "throbber-widgets-tui", "tokio", "tokio-util", @@ -3585,19 +3587,21 @@ dependencies = [ "walkdir", "which 7.0.0", "xz2", - "zip 2.2.0", + "zip 2.2.1", "zstd 0.13.2", ] [[package]] name = "rattler_cache" -version = "0.2.11" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63a90b8eb4a8406619d0685a18d0f55ffae762399258ca5eb422c55ba1fe7282" dependencies = [ "anyhow", "dashmap", "digest", "dirs", + "fs-err 3.0.0", "fs4 0.11.1", "futures", "fxhash", @@ -3618,8 +3622,9 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.29.2" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.29.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa6e2010c1a639982d9c22766598159dbeda9b5701ab01a863c66e55520c1ba1" dependencies = [ "chrono", "dirs", @@ -3627,7 +3632,7 @@ dependencies = [ "fxhash", "glob", "hex", - "indexmap 2.6.0", + "indexmap 2.7.0", "itertools 0.13.0", "lazy-regex", "nom", @@ -3670,7 +3675,8 @@ dependencies = [ [[package]] name = "rattler_digest" version = "1.0.3" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a97526971dd357657ea4c88f6d39b31b2875c87dfe9fd12aac305fec6c0f60" dependencies = [ "blake2", "digest", @@ -3685,8 +3691,9 @@ dependencies = [ [[package]] name = "rattler_index" -version = "0.19.36" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeb6cbe70deeccf7c7cbcf378892e4d639fb661fd825b2220ce006d1c3bf2528" dependencies = [ "fs-err 3.0.0", "rattler_conda_types", @@ -3725,9 +3732,9 @@ dependencies = [ "http", "http-cache-semantics", "include_dir", - "indexmap 2.6.0", + "indexmap 2.7.0", "itertools 0.12.1", - "miette 7.2.0", + "miette 7.4.0", "mime", "once_cell", "parking_lot", @@ -3761,7 +3768,8 @@ dependencies = [ [[package]] name = "rattler_macros" version = "1.0.3" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19eadf6fea87bd67d9d4c372caa3c2bed33cd91cdc235ce86210d7bc513ae0a4" dependencies = [ "quote", "syn", @@ -3769,8 +3777,9 @@ dependencies = [ [[package]] name = "rattler_networking" -version = "0.21.6" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.21.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40f5ad1da789b5bbe9585b4d255f2df82c676a951e2f002a76bf9fa7389c4962" dependencies = [ "anyhow", "async-trait", @@ -3796,11 +3805,13 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.22.14" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.22.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b881c9f633407c171a62809e754315e09d273edcf4e9217d2cc4b102721e65c" dependencies = [ "bzip2", "chrono", + "fs-err 3.0.0", "futures-util", "num_cpus", "rattler_conda_types", @@ -3817,14 +3828,15 @@ dependencies = [ "tokio-util", "tracing", "url", - "zip 2.2.0", + "zip 2.2.1", "zstd 0.13.2", ] [[package]] name = "rattler_redaction" -version = "0.1.3" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "575cd5c830c5c2d25412531c5a3d307a0ca66ddccc466baaa5219cfa9e90c60e" dependencies = [ "reqwest", "reqwest-middleware", @@ -3833,8 +3845,9 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.21.23" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.21.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "315d710364bd4ca46ed37fbb06f50d3e4774f5b7775fb77f1f232d35632fa149" dependencies = [ "anyhow", "async-compression", @@ -3887,12 +3900,13 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.22.7" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "0.22.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "070b851b93cd8973a6e9377c06323aca1d8faeeeb5b59f80f3cd1e2c8a7684bf" dependencies = [ "enum_dispatch", "fs-err 3.0.0", - "indexmap 2.6.0", + "indexmap 2.7.0", "itertools 0.13.0", "rattler_conda_types", "serde_json", @@ -3905,8 +3919,9 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "1.2.3" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "948f7a8d90cfe3cd48637724d2112a82928cdedb1f17027ce1019927cc8ad977" dependencies = [ "chrono", "futures", @@ -3923,8 +3938,9 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "1.1.10" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +version = "1.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7567e46d8ad302bbc3c5d657843c957d481a2c6b7c45397d95e0cd4b8ae47a17" dependencies = [ "archspec", "libloading", @@ -4153,7 +4169,7 @@ dependencies = [ "elsa", "event-listener", "futures", - "indexmap 2.6.0", + "indexmap 2.7.0", "itertools 0.13.0", "petgraph", "tracing", @@ -4254,9 +4270,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustc_version" @@ -4269,22 +4285,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.41" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "rustls" -version = "0.23.17" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "once_cell", "ring", @@ -4296,15 +4312,14 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" dependencies = [ "openssl-probe", - "rustls-pemfile", "rustls-pki-types", "schannel", - "security-framework 2.11.1", + "security-framework 3.0.1", ] [[package]] @@ -4490,7 +4505,7 @@ version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "itoa", "memchr", "ryu", @@ -4539,7 +4554,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_derive", "serde_json", @@ -4565,7 +4580,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "itoa", "ryu", "serde", @@ -4708,7 +4723,8 @@ dependencies = [ [[package]] name = "simple_spawn_blocking" version = "1.0.0" -source = "git+https://github.com/conda/rattler?branch=main#104a5216e50facf88c2b81405f66309ed1a134f5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b31ed96d1593e129cc76cb7aca364fb5c173558bfda922c15aac4e2f2f5844e" dependencies = [ "tokio", ] @@ -4748,17 +4764,11 @@ dependencies = [ "version_check", ] -[[package]] -name = "smawk" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" - [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4850,18 +4860,18 @@ checksum = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" [[package]] name = "supports-color" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77" +checksum = "c64fc7232dd8d2e4ac5ce4ef302b1d81e0b80d055b9d77c7c4f51f6aa4c867d6" dependencies = [ "is_ci", ] [[package]] name = "supports-hyperlinks" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0a1e5168041f5f3ff68ff7d95dcb9c8749df29f6e7e89ada40dd4c9de404ee" +checksum = "804f44ed3c63152de6a9f90acbea1a110441de43006ea51bcce8f436196a288b" [[package]] name = "supports-unicode" @@ -4871,9 +4881,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" -version = "2.0.89" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -4916,9 +4926,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ae3f4f7d64646c46c4cae4e3f01d1c5d255c7406fdd7c7f999a94e488791" +checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af" dependencies = [ "core-foundation-sys", "libc", @@ -4960,19 +4970,9 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "terminal_size" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" dependencies = [ "rustix", "windows-sys 0.59.0", @@ -4984,7 +4984,6 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ - "smawk", "unicode-linebreak", "unicode-width 0.1.14", ] @@ -5000,11 +4999,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.3" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" dependencies = [ - "thiserror-impl 2.0.3", + "thiserror-impl 2.0.6", ] [[package]] @@ -5020,9 +5019,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.3" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" dependencies = [ "proc-macro2", "quote", @@ -5051,9 +5050,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -5072,9 +5071,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -5113,9 +5112,9 @@ checksum = "b130bd8a58c163224b44e217b4239ca7b927d82bf6cc2fea1fc561d15056e3f7" [[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", @@ -5152,20 +5151,19 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ "rustls", - "rustls-pki-types", "tokio", ] [[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", @@ -5175,9 +5173,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -5214,7 +5212,7 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -5229,9 +5227,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -5241,9 +5239,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", @@ -5252,9 +5250,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -5262,9 +5260,9 @@ dependencies = [ [[package]] name = "tracing-indicatif" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069580424efe11d97c3fef4197fa98c004fa26672cc71ad8770d224e23b1951d" +checksum = "74ba258e9de86447f75edf6455fded8e5242704c6fccffe7bf8d7fb6daef1180" dependencies = [ "indicatif", "tracing", @@ -5285,9 +5283,9 @@ dependencies = [ [[package]] name = "tracing-serde" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" dependencies = [ "serde", "tracing-core", @@ -5295,9 +5293,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers", "nu-ansi-term", @@ -5343,9 +5341,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tui-input" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffde6d8fcffe86b617018ca9b2171d673b41def44ebf802de203d2f2c598d3de" +checksum = "e5d1733c47f1a217b7deff18730ff7ca4ecafc5771368f715ab072d679a36114" dependencies = [ "ratatui", "unicode-width 0.2.0", @@ -5441,9 +5439,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -5581,9 +5579,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -5592,13 +5590,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -5607,21 +5604,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5629,9 +5627,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", @@ -5642,9 +5640,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "wasm-streams" @@ -5661,9 +5659,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", @@ -5681,9 +5679,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.6" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -6119,9 +6117,9 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -6131,9 +6129,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", @@ -6226,18 +6224,18 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", @@ -6295,17 +6293,17 @@ dependencies = [ [[package]] name = "zip" -version = "2.2.0" -source = "git+https://github.com/wolfv/zip2?branch=patched#d9ab99aee198b44fe6358febbbf5f8e57da351a8" +version = "2.2.1" +source = "git+https://github.com/wolfv/zip2?branch=patched#999f872ddc1b53fdaa296b96b92b699c885743a2" dependencies = [ "arbitrary", "crc32fast", "crossbeam-utils", "displaydoc", "flate2", - "indexmap 2.6.0", + "indexmap 2.7.0", "memchr", - "thiserror 1.0.69", + "thiserror 2.0.6", "time", "zopfli", ] diff --git a/Cargo.toml b/Cargo.toml index fb86f7226..37bbe01bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust-tests"] [package] name = "rattler-build" -version = "0.31.1" +version = "0.32.0" authors = ["rattler-build contributors "] repository = "https://github.com/prefix-dev/rattler-build" edition = "2021" @@ -48,61 +48,61 @@ required-features = ["recipe-generation"] serde = { version = "1.0.215", features = ["derive"] } serde_yaml = "0.9.34" serde-untagged = "0.1.6" -anyhow = "1.0.93" +anyhow = "1.0.94" walkdir = "2.5.0" sha2 = "0.10.8" hex = "0.4.3" -serde_json = "1.0.132" +serde_json = "1.0.133" reqwest = { version = "0.12.9", default-features = false, features = [ "multipart", ] } -tokio = { version = "1.41.1", features = ["rt", "macros", "rt-multi-thread", "process"] } +tokio = { version = "1.42.0", features = ["rt", "macros", "rt-multi-thread", "process"] } itertools = "0.13.0" content_inspector = "0.2.4" serde_with = "3.11.0" -url = "2.5.3" -tracing = "0.1.40" -clap = { version = "4.5.21", features = ["derive", "env", "cargo"] } +url = "2.5.4" +tracing = "0.1.41" +clap = { version = "4.5.23", features = ["derive", "env", "cargo"] } minijinja = { version = "=2.4.0", features = [ "unstable_machinery", "custom_syntax", ] } -tracing-subscriber = { version = "0.3.18", features = [ +tracing-subscriber = { version = "0.3.19", features = [ "env-filter", "fmt", "ansi", "json", ] } marked-yaml = { version = "0.7.1" } -miette = { version = "7.2.0", features = ["fancy"] } +miette = { version = "7.4.0", features = ["fancy"] } num_cpus = "1.16.0" goblin = "0.9.2" scroll = "0.12.0" -pathdiff = "0.2.2" +pathdiff = "0.2.3" comfy-table = "7.1.3" futures = "0.3.31" indicatif = "0.17.9" console = { version = "0.15.8", features = ["windows-console-colors"] } -thiserror = "2.0.3" +thiserror = "2.0.6" tempfile = "3.14.0" -chrono = "0.4.38" +chrono = "0.4.39" sha1 = "0.10.6" spdx = "0.10.7" ignore = "0.4.23" globset = "0.4.15" -clap-verbosity-flag = "2.2.3" -tracing-core = "0.1.32" +clap-verbosity-flag = "3.0.1" +tracing-core = "0.1.33" petgraph = "0.6.5" -indexmap = "2.6.0" +indexmap = "2.7.0" dunce = "1.0.5" fs-err = "3.0.0" which = "7.0.0" clap_complete = "4.5.38" clap_complete_nushell = "4.5.4" -tokio-util = "0.7.12" +tokio-util = "0.7.13" tar = "0.4.43" -zip = { version = "2.2.0", default-features = false, features = [ +zip = { version = "2.2.1", default-features = false, features = [ "flate2", "deflate", ] } @@ -116,13 +116,13 @@ memmap2 = "0.9.5" reqwest-middleware = "0.4.0" rattler_installs_packages = { version = "0.10.0", default-features = false, optional = true } async-once-cell = "0.5.4" -terminal_size = "0.4.0" +terminal_size = "0.4.1" memchr = "2.7.4" ratatui = { version = "0.29.0", optional = true } crossterm = { version = "0.28.1", features = ["event-stream"], optional = true } ansi-to-tui = { version = "7.0.0", optional = true } throbber-widgets-tui = { version = "0.8", optional = true } -tui-input = { version = "0.11.0", optional = true } +tui-input = { version = "0.11.1", optional = true } reflink-copy = "0.1.20" rayon = "1.10.0" patch = "0.7.0" @@ -130,25 +130,25 @@ regex = "1.11.1" async-recursion = "1.1.1" # Rattler crates -rattler = { version = "0.28.2", default-features = false, features = ["cli-tools", "indicatif"] } -rattler_cache = { version = "0.2.10", default-features = false } -rattler_conda_types = { version = "0.29.2", default-features = false } +rattler = { version = "0.28.5", default-features = false, features = ["cli-tools", "indicatif"] } +rattler_cache = { version = "0.2.13", default-features = false } +rattler_conda_types = { version = "0.29.3", default-features = false } rattler_digest = { version = "1.0.3", default-features = false, features = ["serde"] } -rattler_index = { version = "0.19.36", default-features = false } -rattler_networking = { version = "0.21.5", default-features = false } -rattler_redaction = { version = "0.1.3" } -rattler_repodata_gateway = { version = "0.21.22", default-features = false, features = ["gateway"] } -rattler_shell = { version = "0.22.7", default-features = false, features = ["sysinfo"] } -rattler_solve = { version = "1.2.3", default-features = false, features = ["resolvo", "serde"] } -rattler_virtual_packages = { version = "1.1.10", default-features = false } -rattler_package_streaming = { version = "0.22.13", default-features = false } +rattler_index = { version = "0.20.0", default-features = false } +rattler_networking = { version = "0.21.8", default-features = false } +rattler_redaction = { version = "0.1.4" } +rattler_repodata_gateway = { version = "0.21.25", default-features = false, features = ["gateway"] } +rattler_shell = { version = "0.22.8", default-features = false, features = ["sysinfo"] } +rattler_solve = { version = "1.2.4", default-features = false, features = ["resolvo", "serde"] } +rattler_virtual_packages = { version = "1.1.11", default-features = false } +rattler_package_streaming = { version = "0.22.16", default-features = false } lazy_static = "1.5.0" [dev-dependencies] insta = { version = "1.41.1", features = ["yaml"] } rstest = "0.23.0" tracing-test = "0.2.5" -tracing-indicatif = "0.3.6" +tracing-indicatif = "0.3.8" [profile.dev.package."*"] opt-level = 3 @@ -169,19 +169,6 @@ pre-build = [ # this fork contains fixes for slow zip reading and large file writing zip = { git = "https://github.com/wolfv/zip2", branch = "patched"} -rattler = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_cache = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_conda_types = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_digest = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_index = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_networking = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_repodata_gateway = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_redaction = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_shell = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_solve = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_virtual_packages = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_package_streaming = { git = "https://github.com/conda/rattler", branch = "main" } - # rattler = { path = "../rattler/crates/rattler" } # rattler_cache = { path = "../rattler/crates/rattler_cache" } # rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" } diff --git a/rust-tests/Cargo.toml b/rust-tests/Cargo.toml index df1e0c15e..c7c6ee129 100644 --- a/rust-tests/Cargo.toml +++ b/rust-tests/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] glob = "0.3.1" -rattler_package_streaming = { version = "0.22.11", default-features = false } -serde_json = "1.0.132" +rattler_package_streaming = { version = "0.22.16", default-features = false } +serde_json = "1.0.133" sha1 = "0.10.6" duct = "0.13.7" diff --git a/src/console_utils.rs b/src/console_utils.rs index 675183527..4c7cda3de 100644 --- a/src/console_utils.rs +++ b/src/console_utils.rs @@ -508,11 +508,11 @@ pub enum LogStyle { /// Constructs a default [`EnvFilter`] that is used when the user did not /// specify a custom RUST_LOG. pub fn get_default_env_filter( - verbose: clap_verbosity_flag::LevelFilter, + verbose: clap_verbosity_flag::log::LevelFilter, ) -> Result { let mut result = EnvFilter::new(format!("rattler_build={verbose}")); - if verbose >= clap_verbosity_flag::LevelFilter::Trace { + if verbose >= clap_verbosity_flag::log::LevelFilter::Trace { result = result.add_directive(Directive::from_str("resolvo=info")?); result = result.add_directive(Directive::from_str("rattler=info")?); result = result.add_directive(Directive::from_str( @@ -598,7 +598,8 @@ pub fn init_logging( let registry = tracing_subscriber::registry().with(get_default_env_filter(verbosity.log_level_filter())?); - let log_style = if verbosity.log_level_filter() >= clap_verbosity_flag::LevelFilter::Debug { + let log_style = if verbosity.log_level_filter() >= clap_verbosity_flag::log::LevelFilter::Debug + { LogStyle::Plain } else { *log_style diff --git a/src/recipe/parser/snapshots/rattler_build__recipe__parser__about__test__invalid_license.snap b/src/recipe/parser/snapshots/rattler_build__recipe__parser__about__test__invalid_license.snap index 84498bc10..ae52bec86 100644 --- a/src/recipe/parser/snapshots/rattler_build__recipe__parser__about__test__invalid_license.snap +++ b/src/recipe/parser/snapshots/rattler_build__recipe__parser__about__test__invalid_license.snap @@ -4,7 +4,8 @@ expression: err --- × Failed to parse recipe -Error: × Parsing: failed to parse SPDX license: invalid character(s) +Error: + × Parsing: failed to parse SPDX license: invalid character(s) │ See for the list of valid licenses. │ Use 'LicenseRef-' if you are using a custom license. ╭─[7:22] diff --git a/src/recipe/parser/snapshots/rattler_build__recipe__parser__about__test__invalid_url.snap b/src/recipe/parser/snapshots/rattler_build__recipe__parser__about__test__invalid_url.snap index fe8459846..4a0daa1c9 100644 --- a/src/recipe/parser/snapshots/rattler_build__recipe__parser__about__test__invalid_url.snap +++ b/src/recipe/parser/snapshots/rattler_build__recipe__parser__about__test__invalid_url.snap @@ -4,7 +4,8 @@ expression: err --- × Failed to parse recipe -Error: × Parsing: failed to parse URL: relative URL without a base +Error: + × Parsing: failed to parse URL: relative URL without a base ╭─[7:23] 6 │ about: 7 │ homepage: license_urla.asda:://sdskd diff --git a/src/recipe/parser/snapshots/rattler_build__recipe__parser__output__tests__recipe_schema_error-2.snap b/src/recipe/parser/snapshots/rattler_build__recipe__parser__output__tests__recipe_schema_error-2.snap index fff4c090d..90c04d5d2 100644 --- a/src/recipe/parser/snapshots/rattler_build__recipe__parser__output__tests__recipe_schema_error-2.snap +++ b/src/recipe/parser/snapshots/rattler_build__recipe__parser__output__tests__recipe_schema_error-2.snap @@ -10,6 +10,5 @@ expression: find_outputs_from_src(&src).unwrap_err() · ╰── here 6 │ host: ╰──── - help: multi-output recipes cannot have a top-level requirements field. - Move `requirements` inside the individual output. - + help: multi-output recipes cannot have a top-level requirements field. Move + `requirements` inside the individual output. diff --git a/src/recipe/parser/snapshots/rattler_build__recipe__parser__output__tests__recipe_schema_error-3.snap b/src/recipe/parser/snapshots/rattler_build__recipe__parser__output__tests__recipe_schema_error-3.snap index 2b0abe67c..bb49163f6 100644 --- a/src/recipe/parser/snapshots/rattler_build__recipe__parser__output__tests__recipe_schema_error-3.snap +++ b/src/recipe/parser/snapshots/rattler_build__recipe__parser__output__tests__recipe_schema_error-3.snap @@ -4,10 +4,10 @@ expression: err --- × Failed to parse recipe -Error: × Parsing: missing field `version` +Error: + × Parsing: missing field `version` ╭─[6:11] 5 │ - package: 6 │ ╭─▶ name: bla ╰──── help: the field `version` is required for `package` - diff --git a/src/recipe/parser/snapshots/rattler_build__recipe__parser__package__tests__invalid_fields.snap b/src/recipe/parser/snapshots/rattler_build__recipe__parser__package__tests__invalid_fields.snap index d02fae8b3..2ebe1abc6 100644 --- a/src/recipe/parser/snapshots/rattler_build__recipe__parser__package__tests__invalid_fields.snap +++ b/src/recipe/parser/snapshots/rattler_build__recipe__parser__package__tests__invalid_fields.snap @@ -4,7 +4,8 @@ expression: err --- × Failed to parse recipe -Error: × Parsing: invalid field `invalid`. +Error: + × Parsing: invalid field `invalid`. ╭─[5:13] 4 │ version: 0.1.0 5 │ invalid: "field" @@ -13,4 +14,3 @@ Error: × Parsing: invalid field `invalid`. 6 │ ╰──── help: valid fields for `package` are `name` and `version` - diff --git a/src/recipe/parser/snapshots/rattler_build__recipe__parser__package__tests__missing_fields.snap b/src/recipe/parser/snapshots/rattler_build__recipe__parser__package__tests__missing_fields.snap index 54047f9ac..9964bc592 100644 --- a/src/recipe/parser/snapshots/rattler_build__recipe__parser__package__tests__missing_fields.snap +++ b/src/recipe/parser/snapshots/rattler_build__recipe__parser__package__tests__missing_fields.snap @@ -4,7 +4,8 @@ expression: err --- × Failed to parse recipe -Error: × Parsing: missing field `version` +Error: + × Parsing: missing field `version` ╭─[3:17] 2 │ package: 3 │ name: test @@ -13,4 +14,3 @@ Error: × Parsing: missing field `version` 4 │ ╰──── help: the field `version` is required for `package` - diff --git a/src/recipe/snapshots/rattler_build__recipe__error__tests__miette_output.snap b/src/recipe/snapshots/rattler_build__recipe__error__tests__miette_output.snap index c5491ad78..c9c2da01c 100644 --- a/src/recipe/snapshots/rattler_build__recipe__error__tests__miette_output.snap +++ b/src/recipe/snapshots/rattler_build__recipe__error__tests__miette_output.snap @@ -4,7 +4,8 @@ expression: err --- × Failed to parse recipe -Error: × Parsing: expected a mapping. +Error: + × Parsing: expected a mapping. ╭─[3:17] 2 │ context: 3 │ ╭─▶ - a @@ -13,4 +14,3 @@ Error: × Parsing: expected a mapping. 5 │ package: ╰──── help: `context` must always be a mapping - diff --git a/src/recipe/snapshots/rattler_build__recipe__parser__tests__bad_skip_multi_output.snap b/src/recipe/snapshots/rattler_build__recipe__parser__tests__bad_skip_multi_output.snap index 1d77bf4a1..c2b88da99 100644 --- a/src/recipe/snapshots/rattler_build__recipe__parser__tests__bad_skip_multi_output.snap +++ b/src/recipe/snapshots/rattler_build__recipe__parser__tests__bad_skip_multi_output.snap @@ -4,7 +4,8 @@ expression: err --- × Failed to parse recipe -Error: × Parsing: failed to render Jinja expression: syntax error: unexpected +Error: + × Parsing: failed to render Jinja expression: syntax error: unexpected │ character (in :1) ╭─[12:11] 11 │ skip: diff --git a/src/recipe/snapshots/rattler_build__recipe__parser__tests__bad_skip_single_output.snap b/src/recipe/snapshots/rattler_build__recipe__parser__tests__bad_skip_single_output.snap index d11b04746..aedb1f70d 100644 --- a/src/recipe/snapshots/rattler_build__recipe__parser__tests__bad_skip_single_output.snap +++ b/src/recipe/snapshots/rattler_build__recipe__parser__tests__bad_skip_single_output.snap @@ -4,7 +4,8 @@ expression: err --- × Failed to parse recipe -Error: × Parsing: failed to render Jinja expression: syntax error: unexpected +Error: + × Parsing: failed to render Jinja expression: syntax error: unexpected │ character (in :1) ╭─[7:7] 6 │ skip: diff --git a/src/recipe/snapshots/rattler_build__recipe__parser__tests__context_not_mapping.snap b/src/recipe/snapshots/rattler_build__recipe__parser__tests__context_not_mapping.snap index 37553bbfc..b8b16834e 100644 --- a/src/recipe/snapshots/rattler_build__recipe__parser__tests__context_not_mapping.snap +++ b/src/recipe/snapshots/rattler_build__recipe__parser__tests__context_not_mapping.snap @@ -4,7 +4,8 @@ expression: err --- × Failed to parse recipe -Error: × Parsing: expected a mapping. +Error: + × Parsing: expected a mapping. ╭─[2:18] 1 │ 2 │ context: "not-mapping" @@ -13,4 +14,3 @@ Error: × Parsing: expected a mapping. 3 │ ╰──── help: `context` must always be a mapping - diff --git a/src/recipe/snapshots/rattler_build__recipe__parser__tests__context_value_not_scalar.snap b/src/recipe/snapshots/rattler_build__recipe__parser__tests__context_value_not_scalar.snap index 810185f0d..f382d8a46 100644 --- a/src/recipe/snapshots/rattler_build__recipe__parser__tests__context_value_not_scalar.snap +++ b/src/recipe/snapshots/rattler_build__recipe__parser__tests__context_value_not_scalar.snap @@ -4,7 +4,8 @@ expression: err --- × Failed to parse recipe -Error: × Parsing: expected a scalar value. +Error: + × Parsing: expected a scalar value. ╭─[3:16] 2 │ context: 3 │ key: ["not-scalar"] diff --git a/src/recipe/snapshots/rattler_build__recipe__parser__tests__duplicate_keys_error.snap b/src/recipe/snapshots/rattler_build__recipe__parser__tests__duplicate_keys_error.snap index 513ce159d..9248b0168 100644 --- a/src/recipe/snapshots/rattler_build__recipe__parser__tests__duplicate_keys_error.snap +++ b/src/recipe/snapshots/rattler_build__recipe__parser__tests__duplicate_keys_error.snap @@ -4,7 +4,8 @@ expression: err --- × Failed to parse recipe -Error: × Parsing: failed to parse YAML: duplicate key. +Error: + × Parsing: failed to parse YAML: duplicate key. ╭─[8:1] 7 │ 8 │ build: @@ -12,4 +13,3 @@ Error: × Parsing: failed to parse YAML: duplicate key. · ╰── duplicate key here 9 │ string: "1234" ╰──── - diff --git a/src/recipe/snapshots/rattler_build__recipe__parser__tests__jinja_error.snap b/src/recipe/snapshots/rattler_build__recipe__parser__tests__jinja_error.snap index c7f55652e..f5c80212f 100644 --- a/src/recipe/snapshots/rattler_build__recipe__parser__tests__jinja_error.snap +++ b/src/recipe/snapshots/rattler_build__recipe__parser__tests__jinja_error.snap @@ -4,7 +4,8 @@ expression: err --- × Failed to parse recipe -Error: × Parsing: failed to render Jinja expression: unknown function: zcompiler is +Error: + × Parsing: failed to render Jinja expression: unknown function: zcompiler is │ unknown (in :1) ╭─[7:7] 6 │ host: