diff --git a/Cargo.lock b/Cargo.lock index df4d3685..c0ac2d8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -84,7 +84,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00c4af0bef1b514c9b6a32a773caf604c1390fa7913f4eaa23bfe76f251d6a42" dependencies = [ "nom", - "ratatui", + "ratatui 0.28.1", "simdutf8", "smallvec", "thiserror", @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] name = "arbitrary" @@ -206,9 +206,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.15" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e26a9844c659a2a293d239c7910b752f8487fe122c6c8bd1659bf85a6507c302" +checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857" dependencies = [ "bzip2", "flate2", @@ -634,9 +634,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.30" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", @@ -791,7 +791,7 @@ dependencies = [ "crossterm 0.27.0", "strum", "strum_macros", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -832,7 +832,7 @@ dependencies = [ "encode_unicode", "lazy_static", "libc", - "unicode-width", + "unicode-width 0.1.14", "windows-sys 0.52.0", ] @@ -1304,9 +1304,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "file_url" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b8d0fe7b11e53d71e1484766a00187bc239910dcacb5bf8909f1f3ffd9b4aa" +checksum = "e581e35fcfcf40b1767a88e44e3e1ef27faa11fc7383287d47bd3efef1cfe199" dependencies = [ "itertools 0.13.0", "percent-encoding", @@ -1618,9 +1618,9 @@ dependencies = [ [[package]] name = "goblin" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b363a30c165f666402fe6a3024d3bec7ebc898f96a4a23bd1c99f8dbf3f4f47" +checksum = "a712d2019b1758d703cd0319db5669a6fb27dd768ff9c78cc8847adb2b413930" dependencies = [ "log", "plain", @@ -2021,7 +2021,7 @@ dependencies = [ "http 1.1.0", "hyper 1.5.0", "hyper-util", - "rustls 0.23.14", + "rustls 0.23.15", "rustls-native-certs", "rustls-pki-types", "tokio", @@ -2184,10 +2184,16 @@ dependencies = [ "instant", "number_prefix", "portable-atomic", - "unicode-width", + "unicode-width 0.1.14", "vt100", ] +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + [[package]] name = "inout" version = "0.1.3" @@ -2330,13 +2336,15 @@ dependencies = [ [[package]] name = "keyring" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd3d701d3de5b9c4b0d9d077f8c2c66f0388d75e96932ebbb7cdff8713d7f7c6" +checksum = "11351fce7c6e2b5f1871e3c8ed048d60d909ab6fea6b96bfe41a6409277a2ee5" dependencies = [ "byteorder", "dbus-secret-service", + "log", "secret-service", + "security-framework 2.11.1", "security-framework 3.0.0", "windows-sys 0.59.0", "zbus", @@ -2373,9 +2381,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libdbus-sys" @@ -2539,7 +2547,7 @@ dependencies = [ "miette-derive 5.10.0", "once_cell", "thiserror", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -2559,7 +2567,7 @@ dependencies = [ "terminal_size 0.3.0", "textwrap", "thiserror", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -2826,9 +2834,9 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" -version = "0.10.67" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b8cefcf97f41316955f9294cd61f639bdcfa9f2f230faac6cb896aa8ab64704" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -3052,7 +3060,7 @@ dependencies = [ "once_cell", "regex", "serde", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -3067,7 +3075,7 @@ dependencies = [ "serde", "thiserror", "tracing", - "unicode-width", + "unicode-width 0.1.14", "url", ] @@ -3246,9 +3254,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] @@ -3314,7 +3322,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.14", + "rustls 0.23.15", "socket2", "thiserror", "tokio", @@ -3331,7 +3339,7 @@ dependencies = [ "rand", "ring", "rustc-hash", - "rustls 0.23.14", + "rustls 0.23.15", "slab", "thiserror", "tinyvec", @@ -3414,14 +3422,35 @@ dependencies = [ "strum_macros", "unicode-segmentation", "unicode-truncate", - "unicode-width", + "unicode-width 0.1.14", +] + +[[package]] +name = "ratatui" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" +dependencies = [ + "bitflags 2.6.0", + "cassowary", + "compact_str", + "crossterm 0.28.1", + "indoc", + "instability", + "itertools 0.13.0", + "lru", + "paste", + "strum", + "unicode-segmentation", + "unicode-truncate", + "unicode-width 0.2.0", ] [[package]] name = "rattler" -version = "0.27.15" +version = "0.27.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c338b18f3b9302f1b2bc16810c6a30bc9e98f2c40f37d8658616dbd74a181bcd" +checksum = "19b1afb401b5ae69ef0c20beabdf822c650cc6c387bd01369876a3cc05807b65" dependencies = [ "anyhow", "clap", @@ -3460,7 +3489,7 @@ dependencies = [ [[package]] name = "rattler-build" -version = "0.27.0" +version = "0.28.0" dependencies = [ "ansi-to-tui", "anyhow", @@ -3499,7 +3528,7 @@ dependencies = [ "patch", "pathdiff", "petgraph", - "ratatui", + "ratatui 0.29.0", "rattler", "rattler_cache", "rattler_conda_types", @@ -3552,9 +3581,9 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d1681b88074033ade946e04db58397e9d2f317964d68ec77215c2a685a9ed6" +checksum = "abdd55d83e6b1a573920b0b40b79fe11b4957abef45e2fac3144c323f48a2f60" dependencies = [ "anyhow", "dashmap", @@ -3580,9 +3609,9 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c92d862645c581c7abe238e7fb6295750dd389bb27ca19e05162342e0754f8a" +checksum = "ada4de35daa5b8ef2eecf18f51eaec355c52c5a6f9ca21b6413807b72cb90d0f" dependencies = [ "chrono", "dirs", @@ -3649,9 +3678,9 @@ dependencies = [ [[package]] name = "rattler_index" -version = "0.19.32" +version = "0.19.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d7eed661e52d5364c32fa7b48a3a1dff8898f55068cfa9dc8730e299012ffbb" +checksum = "ee0c6f1aa7b5efa02175627f85873dd2e6b1058c05a4d38638cbd3671882f209" dependencies = [ "fs-err", "rattler_conda_types", @@ -3802,9 +3831,9 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.21.17" +version = "0.21.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3da152300247f1ce8baa6233acdc86494f38ddf2202a47bf50d54b810675e2d" +checksum = "05726dde3ce7a7f46d67b9b41c6515af96219453043f0ba61359df40fbcff4db" dependencies = [ "anyhow", "async-compression", @@ -4104,7 +4133,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.14", + "rustls 0.23.15", "rustls-native-certs", "rustls-pemfile 2.2.0", "rustls-pki-types", @@ -4309,9 +4338,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.14" +version = "0.23.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" +checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" dependencies = [ "once_cell", "ring", @@ -4539,9 +4568,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "indexmap 2.6.0", "itoa", @@ -4925,9 +4954,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" -version = "2.0.79" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", @@ -5057,7 +5086,7 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "smawk", "unicode-linebreak", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -5097,7 +5126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46994acd1137e3e5b78d9b9112d91596b20e64fc6ec788dfc0f2430a2e965633" dependencies = [ "rand", - "ratatui", + "ratatui 0.28.1", ] [[package]] @@ -5207,7 +5236,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.14", + "rustls 0.23.15", "rustls-pki-types", "tokio", ] @@ -5398,8 +5427,8 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd137780d743c103a391e06fe952487f914b299a4fe2c3626677f6a6339a7c6b" dependencies = [ - "ratatui", - "unicode-width", + "ratatui 0.28.1", + "unicode-width 0.1.14", ] [[package]] @@ -5433,12 +5462,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" @@ -5481,7 +5507,7 @@ checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" dependencies = [ "itertools 0.13.0", "unicode-segmentation", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -5490,6 +5516,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -5580,7 +5612,7 @@ checksum = "84cd863bf0db7e392ba3bd04994be3473491b31e66340672af5d11943c6274de" dependencies = [ "itoa", "log", - "unicode-width", + "unicode-width 0.1.14", "vte", ] diff --git a/Cargo.toml b/Cargo.toml index b419d84c..89f72dbd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust-tests"] [package] name = "rattler-build" -version = "0.27.0" +version = "0.28.0" authors = ["rattler-build contributors "] homepage = "https://github.com/prefix-dev/rattler-build" edition = "2021" @@ -48,11 +48,11 @@ required-features = ["recipe-generation"] serde = { version = "1.0.210", features = ["derive"] } serde_yaml = "0.9.34" serde-untagged = "0.1.6" -anyhow = "1.0.89" +anyhow = "1.0.90" walkdir = "2.5.0" sha2 = "0.10.8" hex = "0.4.3" -serde_json = "1.0.128" +serde_json = "1.0.132" reqwest = { version = "0.12.8", default-features = false, features = [ "multipart", ] } @@ -76,7 +76,7 @@ tracing-subscriber = { version = "0.3.18", features = [ marked-yaml = { version = "0.7.1" } miette = { version = "7.2.0", features = ["fancy"] } num_cpus = "1.16.0" -goblin = "0.8.2" +goblin = "0.9.0" scroll = "0.12.0" pathdiff = "0.2.2" comfy-table = "7.1.1" @@ -118,7 +118,7 @@ rattler_installs_packages = { version = "0.9.0", default-features = false, optio async-once-cell = "0.5.4" terminal_size = "0.4.0" memchr = "2.7.4" -ratatui = { version = "0.28.1", optional = true } +ratatui = { version = "0.29.0", optional = true } crossterm = { version = "0.28.1", features = ["event-stream"], optional = true } ansi-to-tui = { version = "6.0.0", optional = true } throbber-widgets-tui = { version = "0.7", optional = true } @@ -130,14 +130,14 @@ regex = "1.11.0" async-recursion = "1.1.1" # Rattler crates -rattler = { version = "0.27.15", default-features = false, features = ["cli-tools", "indicatif"] } -rattler_cache = { version = "0.2.6", default-features = false } -rattler_conda_types = { version = "0.28.2", default-features = false } +rattler = { version = "0.27.16", default-features = false, features = ["cli-tools", "indicatif"] } +rattler_cache = { version = "0.2.7", default-features = false } +rattler_conda_types = { version = "0.28.3", default-features = false } rattler_digest = { version = "1.0.2", default-features = false, features = ["serde"] } -rattler_index = { version = "0.19.32", default-features = false } +rattler_index = { version = "0.19.33", default-features = false } rattler_networking = { version = "0.21.4", default-features = false } rattler_redaction = { version = "0.1.2" } -rattler_repodata_gateway = { version = "0.21.17", default-features = false, features = ["gateway"] } +rattler_repodata_gateway = { version = "0.21.18", default-features = false, features = ["gateway"] } rattler_shell = { version = "0.22.4", default-features = false, features = ["sysinfo"] } rattler_solve = { version = "1.1.0", default-features = false, features = ["resolvo", "serde"] } rattler_virtual_packages = { version = "1.1.7", default-features = false } diff --git a/rust-tests/Cargo.toml b/rust-tests/Cargo.toml index b49f2991..f0e86e6e 100644 --- a/rust-tests/Cargo.toml +++ b/rust-tests/Cargo.toml @@ -8,6 +8,6 @@ edition = "2021" [dependencies] glob = "0.3.1" rattler_package_streaming = { version = "0.22.10", default-features = false } -serde_json = "1.0.128" +serde_json = "1.0.132" sha1 = "0.10.6" duct = "0.13.7"