From 32db47cff56a29b0486759f78c46c1b8ab60e538 Mon Sep 17 00:00:00 2001 From: Daniel Elsner Date: Thu, 15 May 2025 16:38:00 +0200 Subject: [PATCH 1/9] feat: Add purls field to about section --- Cargo.lock | 1 + Cargo.toml | 1 + src/recipe/error.rs | 5 ++ src/recipe/parser/about.rs | 64 ++++++++++++++++++- ...e__parser__about__test__invalid_purls.snap | 15 +++++ test-data/recipes/purls/recipe.yaml | 10 +++ 6 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 src/recipe/parser/snapshots/rattler_build__recipe__parser__about__test__invalid_purls.snap create mode 100644 test-data/recipes/purls/recipe.yaml diff --git a/Cargo.lock b/Cargo.lock index 41c02ca8f..3d605b156 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4301,6 +4301,7 @@ dependencies = [ "pathdiff", "petgraph 0.8.1", "pixi_config", + "purl", "ratatui", "rattler", "rattler_cache", diff --git a/Cargo.toml b/Cargo.toml index 6411dc553..28b1b4ff5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -176,6 +176,7 @@ lazy_static = "1.5.0" reqwest-retry = "0.7.0" retry-policies = "0.4.0" strum = "0.27.1" +purl = "0.1.6" [target.'cfg(not(target_os = "windows"))'.dependencies] sha2 = { version = "0.10.8", features = ["asm"] } diff --git a/src/recipe/error.rs b/src/recipe/error.rs index 430eadcbc..0acabd887 100644 --- a/src/recipe/error.rs +++ b/src/recipe/error.rs @@ -136,6 +136,10 @@ pub enum ErrorKind { #[diagnostic(code(error::url_parsing))] UrlParsing(#[from] url::ParseError), + /// Error when processing URL + #[diagnostic(code(error::purl_parsing))] + PurlParsing(#[from] purl::ParseError), + /// Error when parsing a integer. #[diagnostic(code(error::integer_parsing))] IntegerParsing(#[from] std::num::ParseIntError), @@ -262,6 +266,7 @@ impl fmt::Display for ErrorKind { write!(f, "condition in `if` selector must be a boolean: {}", err) } ErrorKind::UrlParsing(err) => write!(f, "failed to parse URL: {}", err), + ErrorKind::PurlParsing(err) => write!(f, "failed to parse purl: {}", err), ErrorKind::IntegerParsing(err) => write!(f, "failed to parse integer: {}", err), ErrorKind::SpdxParsing(err) => { writeln!(f, "failed to parse SPDX license: {}", err.reason)?; diff --git a/src/recipe/parser/about.rs b/src/recipe/parser/about.rs index baa2dbfad..13c2841f3 100644 --- a/src/recipe/parser/about.rs +++ b/src/recipe/parser/about.rs @@ -1,8 +1,10 @@ use std::{ + collections::BTreeSet, fmt::{Display, Formatter}, str::FromStr, }; +use rattler_conda_types::PackageUrl; use serde::{Deserialize, Serialize}; use serde_with::{DeserializeFromStr, SerializeDisplay}; use spdx::Expression; @@ -12,7 +14,8 @@ use crate::{ _partialerror, recipe::{ custom_yaml::{ - HasSpan, RenderedMappingNode, RenderedNode, RenderedScalarNode, TryConvertNode, + HasSpan, RenderedMappingNode, RenderedNode, RenderedScalarNode, RenderedSequenceNode, + TryConvertNode, }, error::{ErrorKind, PartialParsingError}, }, @@ -45,6 +48,9 @@ pub struct About { /// The license URL of the package. #[serde(skip_serializing_if = "Option::is_none")] pub license_url: Option, + /// The package urls of the package. + #[serde(skip_serializing_if = "Option::is_none")] + pub purls: Option>, /// The summary of the package. #[serde(skip_serializing_if = "Option::is_none")] pub summary: Option, @@ -63,6 +69,42 @@ impl About { } } +impl TryConvertNode> for RenderedSequenceNode { + fn try_convert(&self, name: &str) -> Result, Vec> { + let mut result: BTreeSet = BTreeSet::new(); + let mut errors = Vec::new(); + for item in self.iter() { + let s: String = item.try_convert(name)?; + match PackageUrl::from_str(&s) { + Ok(purl) => { + result.insert(purl); + } + Err(err) => { + errors.push(_partialerror!(*item.span(), ErrorKind::PurlParsing(err),)); + } + } + } + if errors.is_empty() { + Ok(result) + } else { + Err(errors) + } + } +} + +impl TryConvertNode> for RenderedNode { + fn try_convert(&self, name: &str) -> Result, Vec> { + match self { + RenderedNode::Sequence(sequence) => sequence.try_convert(name), + _ => Err(vec![_partialerror!( + *self.span(), + ErrorKind::ExpectedSequence, + label = "expected a list of package urls" + )]), + } + } +} + impl TryConvertNode for RenderedNode { fn try_convert(&self, name: &str) -> Result> { self.as_mapping() @@ -85,6 +127,7 @@ impl TryConvertNode for RenderedMappingNode { license_family, license_file, license_url, + purls, summary, description, prelink_message @@ -185,4 +228,23 @@ mod test { assert_miette_snapshot!(err); } + + #[test] + fn invalid_purls() { + let recipe = r#" + package: + name: test + version: 0.0.1 + + about: + purls: + - purl1 + "#; + + let err: ParseErrors<_> = Recipe::from_yaml(recipe, SelectorConfig::default()) + .unwrap_err() + .into(); + + assert_miette_snapshot!(err); + } } diff --git a/src/recipe/parser/snapshots/rattler_build__recipe__parser__about__test__invalid_purls.snap b/src/recipe/parser/snapshots/rattler_build__recipe__parser__about__test__invalid_purls.snap new file mode 100644 index 000000000..90d599167 --- /dev/null +++ b/src/recipe/parser/snapshots/rattler_build__recipe__parser__about__test__invalid_purls.snap @@ -0,0 +1,15 @@ +--- +source: src/recipe/parser/about.rs +expression: err +--- + × Failed to parse recipe + +Error: + × failed to parse purl: URL scheme must be pkg + ╭─[8:19] + 7 │ purls: + 8 │ - purl1 + · ──┬── + · ╰── here + 9 │ + ╰──── diff --git a/test-data/recipes/purls/recipe.yaml b/test-data/recipes/purls/recipe.yaml new file mode 100644 index 000000000..224345699 --- /dev/null +++ b/test-data/recipes/purls/recipe.yaml @@ -0,0 +1,10 @@ +context: + version: "1.0.0" + +package: + name: "_testpackage_purls" + version: ${{ version }} + +about: + purls: + - pkg:pypi/private-package@${{ version }} From 86d002edd4b13f4862e3900ad82033f851f90cd3 Mon Sep 17 00:00:00 2001 From: Daniel Elsner Date: Thu, 15 May 2025 17:11:01 +0200 Subject: [PATCH 2/9] Add purls to indexjson --- Cargo.lock | 690 +++++++++++++++++++------------------- Cargo.toml | 38 +-- src/lib.rs | 2 +- src/packaging/metadata.rs | 1 + 4 files changed, 362 insertions(+), 369 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d605b156..05298988f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,15 +30,15 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", - "getrandom 0.2.16", + "getrandom 0.3.3", "once_cell", "version_check", - "zerocopy 0.7.35", + "zerocopy", ] [[package]] @@ -223,14 +223,15 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" +checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa" dependencies = [ "async-task", "concurrent-queue", "fastrand", "futures-lite", + "pin-project-lite", "slab", ] @@ -405,9 +406,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4471bef4c22a06d2c7a1b6492493d3fdf24a805323109d6874f9c94d5906ac14" +checksum = "687bc16bc431a8533fe0097c7f0182874767f920989d7260950172ae8e3c4465" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -417,15 +418,15 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.5.6" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aff45ffe35196e593ea3b9dd65b320e51e2dda95aff4390bc459e461d09c6ad" +checksum = "6c4063282c69991e57faab9e5cb21ae557e59f5b0fb285c196335243df8dc25c" dependencies = [ "aws-credential-types", "aws-sigv4", "aws-smithy-async", "aws-smithy-eventstream", - "aws-smithy-http 0.62.0", + "aws-smithy-http 0.62.1", "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", @@ -434,7 +435,6 @@ dependencies = [ "fastrand", "http 0.2.12", "http-body 0.4.6", - "once_cell", "percent-encoding", "pin-project-lite", "tracing", @@ -443,9 +443,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.82.0" +version = "1.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6eab2900764411ab01c8e91a76fd11a63b4e12bc3da97d9e14a0ce1343d86d3" +checksum = "d5c82dae9304e7ced2ff6cca43dceb2d6de534c95a506ff0f168a7463c9a885d" dependencies = [ "aws-credential-types", "aws-runtime", @@ -453,7 +453,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-checksums", "aws-smithy-eventstream", - "aws-smithy-http 0.62.0", + "aws-smithy-http 0.62.1", "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", @@ -478,14 +478,14 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.64.0" +version = "1.67.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d4bdb0e5f80f0689e61c77ab678b2b9304af329616af38aef5b6b967b8e736" +checksum = "0d4863da26489d1e6da91d7e12b10c17e86c14f94c53f416bd10e0a9c34057ba" dependencies = [ "aws-credential-types", "aws-runtime", "aws-smithy-async", - "aws-smithy-http 0.62.0", + "aws-smithy-http 0.62.1", "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", @@ -501,14 +501,14 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.65.0" +version = "1.68.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbbb3ce8da257aedbccdcb1aadafbbb6a5fe9adf445db0e1ea897bdc7e22d08" +checksum = "95caa3998d7237789b57b95a8e031f60537adab21fa84c91e35bef9455c652e4" dependencies = [ "aws-credential-types", "aws-runtime", "aws-smithy-async", - "aws-smithy-http 0.62.0", + "aws-smithy-http 0.62.1", "aws-smithy-json", "aws-smithy-runtime", "aws-smithy-runtime-api", @@ -524,14 +524,14 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.65.0" +version = "1.68.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a78a8f50a1630db757b60f679c8226a8a70ee2ab5f5e6e51dc67f6c61c7cfd" +checksum = "4939f6f449a37308a78c5a910fd91265479bd2bb11d186f0b8fc114d89ec828d" dependencies = [ "aws-credential-types", "aws-runtime", "aws-smithy-async", - "aws-smithy-http 0.62.0", + "aws-smithy-http 0.62.1", "aws-smithy-json", "aws-smithy-query", "aws-smithy-runtime", @@ -548,13 +548,13 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d03c3c05ff80d54ff860fe38c726f6f494c639ae975203a101335f223386db" +checksum = "3503af839bd8751d0bdc5a46b9cac93a003a353e635b0c12cf2376b5b53e41ea" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", - "aws-smithy-http 0.62.0", + "aws-smithy-http 0.62.1", "aws-smithy-runtime-api", "aws-smithy-types", "bytes", @@ -564,7 +564,6 @@ dependencies = [ "hmac", "http 0.2.12", "http 1.3.1", - "once_cell", "p256", "percent-encoding", "ring", @@ -592,7 +591,7 @@ version = "0.63.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b65d21e1ba6f2cdec92044f904356a19f5ad86961acf015741106cdfafd747c0" dependencies = [ - "aws-smithy-http 0.62.0", + "aws-smithy-http 0.62.1", "aws-smithy-types", "bytes", "crc32c", @@ -641,9 +640,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.62.0" +version = "0.62.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5949124d11e538ca21142d1fba61ab0a2a2c1bc3ed323cdb3e4b878bfb83166" +checksum = "99335bec6cdc50a346fda1437f9fefe33abf8c99060739a546a16457f2862ca9" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -654,7 +653,6 @@ dependencies = [ "http 0.2.12", "http 1.3.1", "http-body 0.4.6", - "once_cell", "percent-encoding", "pin-project-lite", "pin-utils", @@ -663,14 +661,14 @@ dependencies = [ [[package]] name = "aws-smithy-http-client" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aff1159006441d02e57204bf57a1b890ba68bedb6904ffd2873c1c4c11c546b" +checksum = "7e44697a9bded898dcd0b1cb997430d949b87f4f8940d91023ae9062bf218250" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", "aws-smithy-types", - "h2 0.4.9", + "h2 0.4.10", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.32", @@ -692,12 +690,11 @@ dependencies = [ [[package]] name = "aws-smithy-observability" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445d065e76bc1ef54963db400319f1dd3ebb3e0a74af20f7f7630625b0cc7cc0" +checksum = "9364d5989ac4dd918e5cc4c4bdcc61c9be17dcd2586ea7f69e348fc7c6cab393" dependencies = [ "aws-smithy-runtime-api", - "once_cell", ] [[package]] @@ -712,12 +709,12 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.8.1" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0152749e17ce4d1b47c7747bdfec09dac1ccafdcbc741ebf9daa2a373356730f" +checksum = "14302f06d1d5b7d333fd819943075b13d27c7700b414f574c3c35859bfb55d5e" dependencies = [ "aws-smithy-async", - "aws-smithy-http 0.62.0", + "aws-smithy-http 0.62.1", "aws-smithy-http-client", "aws-smithy-observability", "aws-smithy-runtime-api", @@ -728,7 +725,6 @@ dependencies = [ "http 1.3.1", "http-body 0.4.6", "http-body 1.0.1", - "once_cell", "pin-project-lite", "pin-utils", "tokio", @@ -737,9 +733,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.7.4" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da37cf5d57011cb1753456518ec76e31691f1f474b73934a284eb2a1c76510f" +checksum = "a1e5d9e3a80a18afa109391fb5ad09c3daf887b516c6fd805a157c6ea7994a57" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -754,9 +750,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836155caafba616c0ff9b07944324785de2ab016141c3550bd1c07882f8cee8f" +checksum = "40076bd09fadbc12d5e026ae080d0930defa606856186e31d83ccc6a255eeaf3" dependencies = [ "base64-simd", "bytes", @@ -789,9 +785,9 @@ dependencies = [ [[package]] name = "aws-types" -version = "1.3.6" +version = "1.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3873f8deed8927ce8d04487630dc9ff73193bab64742a61d050e57a68dec4125" +checksum = "8a322fec39e4df22777ed3ad8ea868ac2f94cd15e1a55f6ee8d8d6305057689a" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -814,9 +810,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ "addr2line", "cfg-if", @@ -876,7 +872,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "848df95320021558dd6bb4c26de3fe66724cdcbdbbf3fa720150b52b086ae568" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "libc", "log", "rustix 0.38.44", @@ -891,9 +887,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" [[package]] name = "bitvec" @@ -1048,9 +1044,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.19" +version = "1.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362" +checksum = "32db95edf998450acc7881c932f94cd9b05c87b4b2599e8bab064753da4acfd1" dependencies = [ "jobserver", "libc", @@ -1071,9 +1067,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1123,9 +1119,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" +checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" dependencies = [ "clap_builder", "clap_derive", @@ -1144,9 +1140,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" +checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" dependencies = [ "anstream", "anstyle", @@ -1156,9 +1152,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.47" +version = "4.5.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06f5378ea264ad4f82bbc826628b5aad714a75abf6ece087e923010eb937fb6" +checksum = "c91d3baa3bcd889d60e6ef28874126a0b384fd225ab83aa6d8a801c519194ce1" dependencies = [ "clap", ] @@ -1322,9 +1318,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.2.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" dependencies = [ "crc-catalog", ] @@ -1429,7 +1425,7 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "crossterm_winapi", "futures-core", "mio", @@ -1858,8 +1854,7 @@ dependencies = [ [[package]] name = "file_url" version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46ca1565923e8d9bcf962889abeeb2f15d4b73356689ce26ae7dd1f54b928498" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "itertools 0.14.0", "percent-encoding", @@ -1893,6 +1888,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" dependencies = [ "crc32fast", + "libz-rs-sys", "miniz_oxide", ] @@ -1958,7 +1954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8640e34b88f7652208ce9e88b1a37a2ae95227d84abec377ccd3c5cfeb141ed4" dependencies = [ "fs-err", - "rustix 1.0.5", + "rustix 1.0.7", "tokio", "windows-sys 0.59.0", ] @@ -2112,9 +2108,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "js-sys", @@ -2257,9 +2253,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633" +checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5" dependencies = [ "atomic-waker", "bytes", @@ -2312,9 +2308,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" dependencies = [ "allocator-api2", "equivalent", @@ -2350,9 +2346,9 @@ checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hermit-abi" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e" +checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" [[package]] name = "hex" @@ -2529,7 +2525,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.9", + "h2 0.4.10", "http 1.3.1", "http-body 1.0.1", "httparse", @@ -2566,13 +2562,13 @@ dependencies = [ "http 1.3.1", "hyper 1.6.0", "hyper-util", - "rustls 0.23.26", + "rustls 0.23.27", "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", "tokio-rustls 0.26.2", "tower-service", - "webpki-roots", + "webpki-roots 0.26.11", ] [[package]] @@ -2637,21 +2633,22 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", ] [[package]] -name = "icu_locid" -version = "1.5.0" +name = "icu_locale_core" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" dependencies = [ "displaydoc", "litemap", @@ -2660,31 +2657,11 @@ dependencies = [ "zerovec", ] -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" - [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" dependencies = [ "displaydoc", "icu_collections", @@ -2692,67 +2669,54 @@ dependencies = [ "icu_properties", "icu_provider", "smallvec", - "utf16_iter", - "utf8_iter", - "write16", "zerovec", ] [[package]] name = "icu_normalizer_data" -version = "1.5.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" [[package]] name = "icu_properties" -version = "1.5.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a" dependencies = [ "displaydoc", "icu_collections", - "icu_locid_transform", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" +checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04" [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" dependencies = [ "displaydoc", - "icu_locid", - "icu_provider_macros", + "icu_locale_core", "stable_deref_trait", "tinystr", "writeable", "yoke", "zerofrom", + "zerotrie", "zerovec", ] -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -2772,9 +2736,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ "icu_normalizer", "icu_properties", @@ -2814,7 +2778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown 0.15.3", "serde", ] @@ -2850,14 +2814,12 @@ dependencies = [ [[package]] name = "insta" -version = "1.42.2" +version = "1.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50259abbaa67d11d2bcafc7ba1d094ed7a0c70e3ce893f0d0997f73558cb3084" +checksum = "154934ea70c58054b556dd430b99a98c2a7ff5309ac9891597e339b5c28f4371" dependencies = [ "console", - "linked-hash-map", "once_cell", - "pin-project", "serde", "similar", ] @@ -2899,7 +2861,7 @@ version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" dependencies = [ - "hermit-abi 0.5.0", + "hermit-abi 0.5.1", "libc", "windows-sys 0.59.0", ] @@ -2964,7 +2926,7 @@ version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" dependencies = [ - "getrandom 0.3.2", + "getrandom 0.3.3", "libc", ] @@ -3086,19 +3048,19 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.53.0", ] [[package]] name = "libm" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9627da5196e5d8ed0b0495e61e518847578da83483c37288316d9b2e03a7f72" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libredox" @@ -3106,16 +3068,19 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "libc", - "redox_syscall 0.5.11", + "redox_syscall 0.5.12", ] [[package]] -name = "linked-hash-map" -version = "0.5.6" +name = "libz-rs-sys" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a" +dependencies = [ + "zlib-rs", +] [[package]] name = "linux-raw-sys" @@ -3131,9 +3096,9 @@ checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "lock_api" @@ -3157,9 +3122,15 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.2", + "hashbrown 0.15.3", ] +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + [[package]] name = "lzma-sys" version = "0.1.20" @@ -3227,9 +3198,9 @@ dependencies = [ [[package]] name = "miette" -version = "7.5.0" +version = "7.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484" +checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7" dependencies = [ "backtrace", "backtrace-ext", @@ -3241,15 +3212,14 @@ dependencies = [ "supports-unicode", "terminal_size", "textwrap", - "thiserror 1.0.69", "unicode-width 0.1.14", ] [[package]] name = "miette-derive" -version = "7.5.0" +version = "7.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147" +checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b" dependencies = [ "proc-macro2", "quote", @@ -3274,9 +3244,9 @@ dependencies = [ [[package]] name = "minijinja" -version = "2.9.0" +version = "2.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98642a6dfca91122779a307b77cd07a4aa951fbe32232aaf5bad9febc66be754" +checksum = "dd72e8b4e42274540edabec853f607c015c73436159b06c39c7af85a20433155" dependencies = [ "aho-corasick", "serde", @@ -3338,7 +3308,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "cfg-if", "cfg_aliases", "libc", @@ -3532,9 +3502,9 @@ dependencies = [ [[package]] name = "opendal" -version = "0.53.1" +version = "0.53.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f407ca2797ca6c010720aa3cedfa0187430e4f70b729c75c33142d44021f59" +checksum = "11ff9e9656d1cb3c58582ea18e6d9e71076a7ab2614207821d1242d7da2daed5" dependencies = [ "anyhow", "async-trait", @@ -3550,7 +3520,7 @@ dependencies = [ "log", "md-5", "percent-encoding", - "quick-xml 0.37.4", + "quick-xml 0.37.5", "reqsign", "reqwest", "serde", @@ -3565,7 +3535,7 @@ version = "0.10.72" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "cfg-if", "foreign-types", "libc", @@ -3593,9 +3563,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.107" +version = "0.9.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07" +checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847" dependencies = [ "cc", "libc", @@ -3717,7 +3687,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.11", + "redox_syscall 0.5.12", "smallvec", "windows-targets 0.52.6", ] @@ -3767,7 +3737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a98c6720655620a521dcc722d0ad66cd8afd5d86e34a89ef691c50b7b24de06" dependencies = [ "fixedbitset", - "hashbrown 0.15.2", + "hashbrown 0.15.3", "indexmap 2.9.0", "serde", ] @@ -3862,7 +3832,7 @@ dependencies = [ [[package]] name = "pixi_config" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#c1a6eb17c969226aa2894ef105830e9693d61414" +source = "git+https://github.com/pavelzw/pixi?branch=bump-rattler#bfd3305314fffccbf8fa119383da2cd31e534e8c" dependencies = [ "clap", "console", @@ -3873,7 +3843,7 @@ dependencies = [ "pixi_consts", "rattler", "rattler_conda_types", - "rattler_networking", + "rattler_networking 0.23.0", "rattler_package_streaming", "rattler_repodata_gateway", "reqwest", @@ -3889,7 +3859,7 @@ dependencies = [ [[package]] name = "pixi_consts" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#c1a6eb17c969226aa2894ef105830e9693d61414" +source = "git+https://github.com/pavelzw/pixi?branch=bump-rattler#bfd3305314fffccbf8fa119383da2cd31e534e8c" dependencies = [ "console", "rattler_cache", @@ -3981,6 +3951,15 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -3993,7 +3972,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.8.24", + "zerocopy", ] [[package]] @@ -4050,9 +4029,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.37.4" +version = "0.37.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4ce8c88de324ff838700f36fb6ab86c96df0e3c4ab6ef3a9b2044465cce1369" +checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" dependencies = [ "memchr", "serde", @@ -4060,9 +4039,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3bd15a6f2967aef83887dcb9fec0014580467e33720d073560cf015a5683012" +checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" dependencies = [ "bytes", "cfg_aliases", @@ -4070,7 +4049,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.26", + "rustls 0.23.27", "socket2", "thiserror 2.0.12", "tokio", @@ -4080,16 +4059,17 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.11" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcbafbbdbb0f638fe3f35f3c56739f77a8a1d070cb25603226c83339b391472b" +checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" dependencies = [ "bytes", - "getrandom 0.3.2", + "getrandom 0.3.3", + "lru-slab", "rand 0.9.1", "ring", "rustc-hash", - "rustls 0.23.26", + "rustls 0.23.27", "rustls-pki-types", "slab", "thiserror 2.0.12", @@ -4100,9 +4080,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "541d0f57c6ec747a90738a52741d3221f7960e8ac2f0ff4b1a63680e033b4ab5" +checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842" dependencies = [ "cfg_aliases", "libc", @@ -4189,7 +4169,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.2", + "getrandom 0.3.3", ] [[package]] @@ -4198,7 +4178,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "cassowary", "compact_str", "crossterm", @@ -4215,9 +4195,8 @@ dependencies = [ [[package]] name = "rattler" -version = "0.33.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e7bfacc5f5ff3517d984b5e2f2df3eea46e8309685cb7cdff39d62f7b2bee2" +version = "0.33.6" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "anyhow", "clap", @@ -4238,7 +4217,7 @@ dependencies = [ "rattler_conda_types", "rattler_digest", "rattler_menuinst", - "rattler_networking", + "rattler_networking 0.23.0", "rattler_package_streaming", "rattler_shell", "rayon", @@ -4297,7 +4276,7 @@ dependencies = [ "miette", "minijinja", "num_cpus", - "opendal 0.53.1", + "opendal 0.53.2", "pathdiff", "petgraph 0.8.1", "pixi_config", @@ -4309,7 +4288,7 @@ dependencies = [ "rattler_digest", "rattler_index", "rattler_menuinst", - "rattler_networking", + "rattler_networking 0.22.12", "rattler_package_streaming", "rattler_redaction", "rattler_repodata_gateway", @@ -4360,9 +4339,8 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd2ad44802bc15f7196f0898ff52729aab52338203ddbdff5212146f45aa2a67" +version = "0.3.18" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "anyhow", "dashmap", @@ -4376,7 +4354,7 @@ dependencies = [ "parking_lot 0.12.3", "rattler_conda_types", "rattler_digest", - "rattler_networking", + "rattler_networking 0.23.0", "rattler_package_streaming", "rayon", "reqwest", @@ -4392,9 +4370,8 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21c2ed99f2fc8044499c63c65db265f6ec3e0333cdf15bb442d5063187449d51" +version = "0.33.0" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "chrono", "core-foundation 0.10.0", @@ -4433,8 +4410,7 @@ dependencies = [ [[package]] name = "rattler_digest" version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34751b3e9c9755379281d1b49b9335648a4686c434ce77b5376323980d38e1b8" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "blake2", "digest", @@ -4450,9 +4426,8 @@ dependencies = [ [[package]] name = "rattler_index" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3674b10a38a3033d0124978f6c251ad0926d4a621c7330bf03dfd61c40a0078a" +version = "0.22.6" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "anyhow", "bytes", @@ -4466,7 +4441,7 @@ dependencies = [ "opendal 0.52.0", "rattler_conda_types", "rattler_digest", - "rattler_networking", + "rattler_networking 0.23.0", "rattler_package_streaming", "reqwest", "serde_json", @@ -4479,8 +4454,7 @@ dependencies = [ [[package]] name = "rattler_macros" version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9b25725cedeef8dee22c41dee138daf76ebd70da50fe210aa5e50288036816" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "quote", "syn", @@ -4488,9 +4462,8 @@ dependencies = [ [[package]] name = "rattler_menuinst" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3eedb82b5366136093acb1bafc4839f3f122c64889a358cbe6e50fc8c573b0" +version = "0.2.8" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "chrono", "configparser", @@ -4499,7 +4472,7 @@ dependencies = [ "known-folders", "once_cell", "plist", - "quick-xml 0.37.4", + "quick-xml 0.37.5", "rattler_conda_types", "rattler_shell", "regex", @@ -4521,6 +4494,33 @@ name = "rattler_networking" version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfe0171ee4c22e335ade0cb926e83cdf08a5dda5eaf26fc21fa9948beb65c764" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.22.1", + "dirs", + "fs-err", + "getrandom 0.2.16", + "google-cloud-auth", + "http 1.3.1", + "itertools 0.14.0", + "keyring", + "netrc-rs", + "reqwest", + "reqwest-middleware", + "retry-policies", + "serde", + "serde_json", + "tempfile", + "thiserror 2.0.12", + "tracing", + "url", +] + +[[package]] +name = "rattler_networking" +version = "0.23.0" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "anyhow", "async-trait", @@ -4548,9 +4548,8 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.22.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11879ff84195638459a15f0bb4c0d167f58ecd497d2df00df46c6cf81c0f2bb7" +version = "0.22.37" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "bzip2", "chrono", @@ -4559,7 +4558,7 @@ dependencies = [ "num_cpus", "rattler_conda_types", "rattler_digest", - "rattler_networking", + "rattler_networking 0.23.0", "rattler_redaction", "reqwest", "reqwest-middleware", @@ -4579,8 +4578,7 @@ dependencies = [ [[package]] name = "rattler_pty" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1ba454a7e23bfe50c09abdb3164e26f98b326a04c104389c41e300918b219f" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "libc", "nix", @@ -4590,8 +4588,7 @@ dependencies = [ [[package]] name = "rattler_redaction" version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d46116e48405681feb0c0c9938ecb6751825eb9bde353069e516784ca983e9" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "reqwest", "reqwest-middleware", @@ -4600,9 +4597,8 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e25d367f6ff1d83cf925ccacfcf7805f94030f96de6858992db37edb3c5a638" +version = "0.22.6" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "anyhow", "async-compression", @@ -4632,7 +4628,7 @@ dependencies = [ "rattler_cache", "rattler_conda_types", "rattler_digest", - "rattler_networking", + "rattler_networking 0.23.0", "rattler_redaction", "reqwest", "reqwest-middleware", @@ -4658,8 +4654,7 @@ dependencies = [ [[package]] name = "rattler_sandbox" version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b14b645c39a3822a3ae3ccc5d02e3ea830576e98178c0c47dcb2d19b227fa96c" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "birdcage", "clap", @@ -4669,9 +4664,8 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.22.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf546ea648c95cfeb27d8eedb6d592c8dec050d2dc9fb9af5be4ffe13759d7f" +version = "0.23.0" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "anyhow", "enum_dispatch", @@ -4690,9 +4684,8 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "1.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b632fe7366b6b17e5ba96b14af992258aca04e2d36cf467a19f7980fa2298d7" +version = "1.4.6" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "chrono", "futures", @@ -4708,9 +4701,8 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "2.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f8be154a9e0be3bfab3a68263ac568207eab9fb0e0820316374e805b340033" +version = "2.0.11" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "archspec", "libloading", @@ -4756,11 +4748,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" +checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", ] [[package]] @@ -4802,7 +4794,7 @@ checksum = "78c81d000a2c524133cc00d2f92f019d399e57906c3b7119271a2495354fe895" dependencies = [ "cfg-if", "libc", - "rustix 1.0.5", + "rustix 1.0.7", "windows 0.61.1", ] @@ -4880,7 +4872,7 @@ dependencies = [ "http 1.3.1", "log", "percent-encoding", - "quick-xml 0.37.4", + "quick-xml 0.37.5", "rand 0.8.5", "reqwest", "rust-ini", @@ -4902,7 +4894,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.4.9", + "h2 0.4.10", "http 1.3.1", "http-body 1.0.1", "http-body-util", @@ -4920,7 +4912,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.26", + "rustls 0.23.27", "rustls-native-certs 0.8.1", "rustls-pemfile 2.2.0", "rustls-pki-types", @@ -4940,7 +4932,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", + "webpki-roots 0.26.11", "windows-registry 0.4.0", ] @@ -4983,9 +4975,9 @@ dependencies = [ [[package]] name = "resolvo" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "996e40b356864ad72942a9ef6815df7f219b7b42ccc791906d3e0a17df5d66ab" +checksum = "dba027c8e5dd4b5e5a690cfcfb3900d5ffe6985adb048cbd111d5aa596a6c0c8" dependencies = [ "ahash", "bitvec", @@ -5134,7 +5126,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "errno", "libc", "linux-raw-sys 0.4.15", @@ -5143,11 +5135,11 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "errno", "libc", "linux-raw-sys 0.9.4", @@ -5168,14 +5160,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.26" +version = "0.23.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" +checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321" dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.1", + "rustls-webpki 0.103.3", "subtle", "zeroize", ] @@ -5224,11 +5216,12 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" dependencies = [ "web-time", + "zeroize", ] [[package]] @@ -5243,9 +5236,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.1" +version = "0.103.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" +checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" dependencies = [ "ring", "rustls-pki-types", @@ -5381,7 +5374,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "core-foundation 0.9.4", "core-foundation-sys", "libc", @@ -5394,7 +5387,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "core-foundation 0.10.0", "core-foundation-sys", "libc", @@ -5456,9 +5449,9 @@ dependencies = [ [[package]] name = "serde_ignored" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566da67d80e92e009728b3731ff0e5360cb181432b8ca73ea30bb1d170700d76" +checksum = "b516445dac1e3535b6d658a7b528d771153dfb272ed4180ca4617a20550365ff" dependencies = [ "serde", ] @@ -5589,9 +5582,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -5619,9 +5612,9 @@ dependencies = [ [[package]] name = "shared_child" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c" +checksum = "7e297bd52991bbe0686c086957bee142f13df85d1e79b0b21630a99d374ae9dc" dependencies = [ "libc", "windows-sys 0.59.0", @@ -5635,9 +5628,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" dependencies = [ "libc", "signal-hook-registry", @@ -5721,8 +5714,7 @@ dependencies = [ [[package]] name = "simple_spawn_blocking" version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55c0b0b683828aa9d4f5c0e59b0c856a12c30a65b5f1ca4292664734d76fa9c2" +source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" dependencies = [ "tokio", ] @@ -5888,9 +5880,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" -version = "2.0.100" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", @@ -5908,9 +5900,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", @@ -5923,7 +5915,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "byteorder", "enum-as-inner", "libc", @@ -5951,7 +5943,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", "core-foundation 0.9.4", "system-configuration-sys", ] @@ -5985,14 +5977,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.19.1" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" dependencies = [ "fastrand", - "getrandom 0.3.2", + "getrandom 0.3.3", "once_cell", - "rustix 1.0.5", + "rustix 1.0.7", "windows-sys 0.59.0", ] @@ -6002,7 +5994,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed" dependencies = [ - "rustix 1.0.5", + "rustix 1.0.7", "windows-sys 0.59.0", ] @@ -6118,9 +6110,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ "displaydoc", "zerovec", @@ -6153,9 +6145,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.44.2" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" +checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165" dependencies = [ "backtrace", "bytes", @@ -6206,7 +6198,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" dependencies = [ - "rustls 0.23.26", + "rustls 0.23.27", "tokio", ] @@ -6226,9 +6218,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" +checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" dependencies = [ "serde", "serde_spanned", @@ -6238,26 +6230,33 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.24" +version = "0.22.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" dependencies = [ "indexmap 2.9.0", "serde", "serde_spanned", "toml_datetime", + "toml_write", "winnow", ] +[[package]] +name = "toml_write" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076" + [[package]] name = "tower" version = "0.5.2" @@ -6529,12 +6528,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -6553,7 +6546,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" dependencies = [ - "getrandom 0.3.2", + "getrandom 0.3.3", "js-sys", "rand 0.9.1", "serde", @@ -6798,9 +6791,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.8" +version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +dependencies = [ + "webpki-roots 1.0.0", +] + +[[package]] +name = "webpki-roots" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" dependencies = [ "rustls-pki-types", ] @@ -6813,7 +6815,7 @@ checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762" dependencies = [ "either", "env_home", - "rustix 1.0.5", + "rustix 1.0.7", "winsafe", ] @@ -7313,9 +7315,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.7.6" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" +checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec" dependencies = [ "memchr", ] @@ -7341,20 +7343,14 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.9.1", ] -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" [[package]] name = "wyz" @@ -7372,7 +7368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e" dependencies = [ "libc", - "rustix 1.0.5", + "rustix 1.0.7", ] [[package]] @@ -7413,9 +7409,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" dependencies = [ "serde", "stable_deref_trait", @@ -7425,9 +7421,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", @@ -7499,38 +7495,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" dependencies = [ - "zerocopy-derive 0.7.35", -] - -[[package]] -name = "zerocopy" -version = "0.8.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" -dependencies = [ - "zerocopy-derive 0.8.24", + "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" +checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" dependencies = [ "proc-macro2", "quote", @@ -7564,11 +7540,22 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" dependencies = [ "yoke", "zerofrom", @@ -7577,9 +7564,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", @@ -7588,13 +7575,12 @@ dependencies = [ [[package]] name = "zip" -version = "2.6.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dcb24d0152526ae49b9b96c1dcf71850ca1e0b882e4e28ed898a93c41334744" +checksum = "12598812502ed0105f607f941c386f43d441e00148fce9dec3ca5ffb0bde9308" dependencies = [ "arbitrary", "crc32fast", - "crossbeam-utils", "flate2", "indexmap 2.9.0", "memchr", @@ -7602,6 +7588,12 @@ dependencies = [ "zopfli", ] +[[package]] +name = "zlib-rs" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8" + [[package]] name = "zopfli" version = "0.8.2" diff --git a/Cargo.toml b/Cargo.toml index 28b1b4ff5..6711254bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -111,8 +111,8 @@ clap_complete_nushell = "4.5.5" tokio-util = { version = "0.7.14", features = ["codec", "compat"] } tar = "0.4.44" -zip = { version = "2.6.1", default-features = false, features = [ - "flate2", +zip = { version = "3.0.0", default-features = false, features = [ + "deflate-flate2", "deflate", ] } bzip2 = "0.5.2" @@ -141,13 +141,13 @@ opendal = { version = "0.53.0", default-features = false, features = [ ] } # Rattler crates -pixi_config = { git = "https://github.com/prefix-dev/pixi", branch = "main" } +pixi_config = { git = "https://github.com/pavelzw/pixi", branch = "bump-rattler" } rattler = { version = "0.33.5", default-features = false, features = [ "cli-tools", "indicatif", ] } rattler_cache = { version = "0.3.17", default-features = false } -rattler_conda_types = { version = "0.32.0", default-features = false, features = [ +rattler_conda_types = { version = "0.33.0", default-features = false, features = [ "rayon", ] } rattler_digest = { version = "1.1.1", default-features = false, features = [ @@ -162,7 +162,7 @@ rattler_repodata_gateway = { version = "0.22.5", default-features = false, featu rattler_sandbox = { version = "0.1.7", default-features = false, features = [ "tokio", ] } -rattler_shell = { version = "0.22.26", default-features = false, features = [ +rattler_shell = { version = "0.23.0", default-features = false, features = [ "sysinfo", ] } rattler_solve = { version = "1.4.4", default-features = false, features = [ @@ -197,17 +197,17 @@ name = "line_breaks" harness = false [patch.crates-io] -# rattler = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } -# rattler_sandbox = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } -# rattler_cache = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } -# rattler_conda_types = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } -# rattler_digest = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } -# rattler_index = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } -# rattler_networking = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } -# rattler_repodata_gateway = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } -# rattler_shell = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } -# rattler_solve = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } -# rattler_redaction = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } -# rattler_virtual_packages = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } -# rattler_package_streaming = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } -# rattler_menuinst = { git = "https://github.com/wolfv/rattler", branch = "pub-schema" } +rattler = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler_sandbox = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler_cache = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler_conda_types = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler_digest = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler_index = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler_networking = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler_repodata_gateway = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler_shell = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler_solve = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler_redaction = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler_virtual_packages = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler_package_streaming = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler_menuinst = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } diff --git a/src/lib.rs b/src/lib.rs index baf6523cc..16bdb622e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -675,7 +675,7 @@ pub async fn rebuild( rebuild::extract_recipe(&args.package_file, temp_folder.path()).into_diagnostic()?; - let temp_dir = temp_folder.into_path(); + let temp_dir = temp_folder.keep(); tracing::info!("Extracted recipe to: {:?}", temp_dir); diff --git a/src/packaging/metadata.rs b/src/packaging/metadata.rs index eac69504a..bc3568bbc 100644 --- a/src/packaging/metadata.rs +++ b/src/packaging/metadata.rs @@ -301,6 +301,7 @@ impl Output { subdir: Some(self.build_configuration.target_platform.to_string()), license: recipe.about().license.as_ref().map(|l| l.to_string()), license_family: recipe.about().license_family.clone(), + purls: recipe.about().purls.clone(), timestamp: Some(self.build_configuration.timestamp), depends: finalized_dependencies .run From 515c163de074c26903b7d46bda91214c49e8c0a4 Mon Sep 17 00:00:00 2001 From: Daniel Elsner Date: Thu, 15 May 2025 17:24:27 +0200 Subject: [PATCH 3/9] Bump rattler_networking --- Cargo.lock | 42 +++++++----------------------------------- Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 133ef6245..3de7e77d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3821,7 +3821,7 @@ dependencies = [ "pixi_consts", "rattler", "rattler_conda_types", - "rattler_networking 0.23.0", + "rattler_networking", "rattler_package_streaming", "rattler_repodata_gateway", "reqwest", @@ -4195,7 +4195,7 @@ dependencies = [ "rattler_conda_types", "rattler_digest", "rattler_menuinst", - "rattler_networking 0.23.0", + "rattler_networking", "rattler_package_streaming", "rattler_shell", "rayon", @@ -4266,7 +4266,7 @@ dependencies = [ "rattler_digest", "rattler_index", "rattler_menuinst", - "rattler_networking 0.22.12", + "rattler_networking", "rattler_package_streaming", "rattler_redaction", "rattler_repodata_gateway", @@ -4333,7 +4333,7 @@ dependencies = [ "parking_lot 0.12.3", "rattler_conda_types", "rattler_digest", - "rattler_networking 0.23.0", + "rattler_networking", "rattler_package_streaming", "rayon", "reqwest", @@ -4420,7 +4420,7 @@ dependencies = [ "opendal 0.52.0", "rattler_conda_types", "rattler_digest", - "rattler_networking 0.23.0", + "rattler_networking", "rattler_package_streaming", "reqwest", "serde_json", @@ -4468,34 +4468,6 @@ dependencies = [ "windows-registry 0.5.1", ] -[[package]] -name = "rattler_networking" -version = "0.22.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe0171ee4c22e335ade0cb926e83cdf08a5dda5eaf26fc21fa9948beb65c764" -dependencies = [ - "anyhow", - "async-trait", - "base64 0.22.1", - "dirs", - "fs-err", - "getrandom 0.2.16", - "google-cloud-auth", - "http 1.3.1", - "itertools 0.14.0", - "keyring", - "netrc-rs", - "reqwest", - "reqwest-middleware", - "retry-policies", - "serde", - "serde_json", - "tempfile", - "thiserror 2.0.12", - "tracing", - "url", -] - [[package]] name = "rattler_networking" version = "0.23.0" @@ -4537,7 +4509,7 @@ dependencies = [ "num_cpus", "rattler_conda_types", "rattler_digest", - "rattler_networking 0.23.0", + "rattler_networking", "rattler_redaction", "reqwest", "reqwest-middleware", @@ -4607,7 +4579,7 @@ dependencies = [ "rattler_cache", "rattler_conda_types", "rattler_digest", - "rattler_networking 0.23.0", + "rattler_networking", "rattler_redaction", "reqwest", "reqwest-middleware", diff --git a/Cargo.toml b/Cargo.toml index f85119a4a..7e42bbfde 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -153,7 +153,7 @@ rattler_digest = { version = "1.1.1", default-features = false, features = [ "serde", ] } rattler_index = { version = "0.22.5", default-features = false } -rattler_networking = { version = "0.22.12", default-features = false } +rattler_networking = { version = "0.23.0", default-features = false } rattler_redaction = { version = "0.1.10" } rattler_repodata_gateway = { version = "0.22.5", default-features = false, features = [ "gateway", From 3db835f26b0fd224ef800e7a0cb5e94d24331434 Mon Sep 17 00:00:00 2001 From: Daniel Elsner Date: Thu, 15 May 2025 17:27:42 +0200 Subject: [PATCH 4/9] Fix tempdir --- Cargo.toml | 4 +++- src/linux/link.rs | 8 ++++---- src/source/copy_dir.rs | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7e42bbfde..66a86cb86 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -153,7 +153,9 @@ rattler_digest = { version = "1.1.1", default-features = false, features = [ "serde", ] } rattler_index = { version = "0.22.5", default-features = false } -rattler_networking = { version = "0.23.0", default-features = false } +rattler_networking = { version = "0.23.0", default-features = false, features = [ + "s3", +] } rattler_redaction = { version = "0.1.10" } rattler_repodata_gateway = { version = "0.22.5", default-features = false, features = [ "gateway", diff --git a/src/linux/link.rs b/src/linux/link.rs index b56a69f03..ae2ace048 100644 --- a/src/linux/link.rs +++ b/src/linux/link.rs @@ -426,7 +426,7 @@ mod test { // copy binary to a temporary directory let prefix = Path::new(env!("CARGO_MANIFEST_DIR")).join("test-data/binary_files"); - let tmp_dir = tempdir_in(&prefix)?.into_path(); + let tmp_dir = tempdir_in(&prefix)?.keep(); let binary_path = tmp_dir.join("zlink"); fs::copy(prefix.join("zlink"), &binary_path)?; @@ -457,7 +457,7 @@ mod test { ); // manually clean up temporary directory because it was - // persisted to disk by calling `into_path` + // persisted to disk by calling `keep` fs::remove_dir_all(tmp_dir)?; Ok(()) @@ -477,7 +477,7 @@ mod test { // copy binary to a temporary directory let prefix = Path::new(env!("CARGO_MANIFEST_DIR")).join("test-data/binary_files"); - let tmp_dir = tempdir_in(&prefix)?.into_path(); + let tmp_dir = tempdir_in(&prefix)?.keep(); let binary_path = tmp_dir.join("zlink-no-rpath"); fs::copy(prefix.join("zlink-no-rpath"), &binary_path)?; @@ -502,7 +502,7 @@ mod test { ); // manually clean up temporary directory because it was - // persisted to disk by calling `into_path` + // persisted to disk by calling `keep` fs::remove_dir_all(tmp_dir)?; Ok(()) diff --git a/src/source/copy_dir.rs b/src/source/copy_dir.rs index 2b82113fe..d10058477 100644 --- a/src/source/copy_dir.rs +++ b/src/source/copy_dir.rs @@ -483,7 +483,7 @@ mod test { #[test] fn test_copy_dir() { let tmp_dir = tempfile::TempDir::new().unwrap(); - let tmp_dir_path = tmp_dir.into_path(); + let tmp_dir_path = tmp_dir.keep(); let dir = tmp_dir_path.as_path().join("test_copy_dir"); fs_err::create_dir_all(&dir).unwrap(); From 4bb02e4e78100a2b0d6ae67cfc2409f1fa9e75a5 Mon Sep 17 00:00:00 2001 From: Daniel Elsner Date: Thu, 15 May 2025 17:31:54 +0200 Subject: [PATCH 5/9] Fix insta snapshots --- .../rattler_build__recipe__parser__tests__recipe_windows.snap | 1 + .../rattler_build__recipe__parser__tests__unix_recipe.snap | 1 + 2 files changed, 2 insertions(+) diff --git a/src/recipe/snapshots/rattler_build__recipe__parser__tests__recipe_windows.snap b/src/recipe/snapshots/rattler_build__recipe__parser__tests__recipe_windows.snap index 158a1c27d..6f7f46357 100644 --- a/src/recipe/snapshots/rattler_build__recipe__parser__tests__recipe_windows.snap +++ b/src/recipe/snapshots/rattler_build__recipe__parser__tests__recipe_windows.snap @@ -457,6 +457,7 @@ Recipe { "LICENSE{,/**}", ], license_url: None, + purls: None, summary: Some( "The C++ tensor algebra library", ), diff --git a/src/recipe/snapshots/rattler_build__recipe__parser__tests__unix_recipe.snap b/src/recipe/snapshots/rattler_build__recipe__parser__tests__unix_recipe.snap index 31d0f06bc..b041c7a51 100644 --- a/src/recipe/snapshots/rattler_build__recipe__parser__tests__unix_recipe.snap +++ b/src/recipe/snapshots/rattler_build__recipe__parser__tests__unix_recipe.snap @@ -480,6 +480,7 @@ Recipe { "LICENSE{,/**}", ], license_url: None, + purls: None, summary: Some( "The C++ tensor algebra library", ), From f4c482c01dbe9d57a6e9ea5f131bee186b8737ee Mon Sep 17 00:00:00 2001 From: Daniel Elsner Date: Thu, 15 May 2025 17:34:45 +0200 Subject: [PATCH 6/9] Install yq via pixi --- .github/workflows/rust.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ca82fc6c0..bd43ae386 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -93,12 +93,19 @@ jobs: - name: Checkout source code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + - name: Setup pixi + uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8 + with: + run-install: false + + - name: Install yq + run: pixi global install go-yq + - name: Extract version shell: bash id: metadata run: | # also call this step outside of $(...) to make sure the status code is propagated - ${{ startsWith(matrix.os, 'windows') && 'choco install yq' || '' }} yq '.package.version' Cargo.toml echo "project-version=$(yq '.package.version' Cargo.toml)" >> $GITHUB_OUTPUT From 16a2caa97c82bf9c30f3bbb872b78d37d670e5f7 Mon Sep 17 00:00:00 2001 From: Daniel Elsner Date: Thu, 15 May 2025 17:58:16 +0200 Subject: [PATCH 7/9] Add e2e test --- src/recipe/error.rs | 2 +- test-data/recipes/purls/recipe.yaml | 7 +++++-- test/end-to-end/test_simple.py | 15 ++++++++++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/recipe/error.rs b/src/recipe/error.rs index 4b5bdb2b5..c96af58c1 100644 --- a/src/recipe/error.rs +++ b/src/recipe/error.rs @@ -136,7 +136,7 @@ pub enum ErrorKind { #[diagnostic(code(error::url_parsing))] UrlParsing(#[from] url::ParseError), - /// Error when processing URL + /// Error when processing purl #[diagnostic(code(error::purl_parsing))] PurlParsing(#[from] purl::ParseError), diff --git a/test-data/recipes/purls/recipe.yaml b/test-data/recipes/purls/recipe.yaml index 224345699..78dd051e1 100644 --- a/test-data/recipes/purls/recipe.yaml +++ b/test-data/recipes/purls/recipe.yaml @@ -2,9 +2,12 @@ context: version: "1.0.0" package: - name: "_testpackage_purls" + name: "purls" version: ${{ version }} +build: + noarch: generic + about: purls: - - pkg:pypi/private-package@${{ version }} + - pkg:pypi/purls@${{ version }} diff --git a/test/end-to-end/test_simple.py b/test/end-to-end/test_simple.py index 91d0bb96b..8d3faf89e 100644 --- a/test/end-to-end/test_simple.py +++ b/test/end-to-end/test_simple.py @@ -2,17 +2,18 @@ import json import os import platform +import subprocess import uuid from dataclasses import dataclass, field from pathlib import Path from subprocess import DEVNULL, STDOUT, CalledProcessError, check_output from typing import Iterator +from zipfile import ZipFile import boto3 import pytest import requests import yaml -import subprocess from helpers import RattlerBuild, check_build_output, get_extracted_package, get_package @@ -1903,3 +1904,15 @@ def test_merge_build_and_host( recipes / "merge_build_and_host/recipe.yaml", tmp_path, ) + + +def test_purls(rattler_build: RattlerBuild, recipes: Path, tmp_path: Path): + rattler_build.build( + recipes / "purls", + tmp_path, + ) + + extracted_dir = get_extracted_package(tmp_path, "purls") + assert extracted_dir.exists() + assert (index_json := (extracted_dir / "info" / "index.json")).exists() + assert (json.loads(index_json.read_text()))["purls"] == ["pkg:pypi/purls@1.0.0"] From 1ce4c0458e13755af804ca71d271162382869383 Mon Sep 17 00:00:00 2001 From: Daniel Elsner Date: Thu, 15 May 2025 18:05:45 +0200 Subject: [PATCH 8/9] Add e2e test --- test-data/recipes/purls/recipe.yaml | 5 +++++ test/end-to-end/test_simple.py | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/test-data/recipes/purls/recipe.yaml b/test-data/recipes/purls/recipe.yaml index 78dd051e1..e15847889 100644 --- a/test-data/recipes/purls/recipe.yaml +++ b/test-data/recipes/purls/recipe.yaml @@ -11,3 +11,8 @@ build: about: purls: - pkg:pypi/purls@${{ version }} + - if: linux + then: pkg:conda/purls-linux@${{ version }} + else: pkg:conda/purls-other@${{ version }} + + diff --git a/test/end-to-end/test_simple.py b/test/end-to-end/test_simple.py index 8d3faf89e..0a9d9fe5b 100644 --- a/test/end-to-end/test_simple.py +++ b/test/end-to-end/test_simple.py @@ -1915,4 +1915,7 @@ def test_purls(rattler_build: RattlerBuild, recipes: Path, tmp_path: Path): extracted_dir = get_extracted_package(tmp_path, "purls") assert extracted_dir.exists() assert (index_json := (extracted_dir / "info" / "index.json")).exists() - assert (json.loads(index_json.read_text()))["purls"] == ["pkg:pypi/purls@1.0.0"] + assert set((json.loads(index_json.read_text()))["purls"]) == { + "pkg:pypi/purls@1.0.0", + f'pkg:conda/purls-{"linux" if platform.system() == "Linux" else "other"}@1.0.0', + } From f7279a5d8ed3cb1eadc4b0046441b48ec16188e8 Mon Sep 17 00:00:00 2001 From: Daniel Elsner Date: Thu, 15 May 2025 18:20:43 +0200 Subject: [PATCH 9/9] Fix pins --- Cargo.lock | 40 ++++++++++++++++++++-------------------- Cargo.toml | 30 +++++++++++++++--------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3de7e77d2..aeaba563a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1848,7 +1848,7 @@ dependencies = [ [[package]] name = "file_url" version = "0.2.4" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "itertools 0.14.0", "percent-encoding", @@ -3810,7 +3810,7 @@ dependencies = [ [[package]] name = "pixi_config" version = "0.1.0" -source = "git+https://github.com/pavelzw/pixi?branch=bump-rattler#bfd3305314fffccbf8fa119383da2cd31e534e8c" +source = "git+https://github.com/pavelzw/pixi?branch=bump-rattler#64b5a64eae1e8691e120a5fd9b15fe678045a20e" dependencies = [ "clap", "console", @@ -3837,7 +3837,7 @@ dependencies = [ [[package]] name = "pixi_consts" version = "0.1.0" -source = "git+https://github.com/pavelzw/pixi?branch=bump-rattler#bfd3305314fffccbf8fa119383da2cd31e534e8c" +source = "git+https://github.com/pavelzw/pixi?branch=bump-rattler#64b5a64eae1e8691e120a5fd9b15fe678045a20e" dependencies = [ "console", "rattler_cache", @@ -4174,7 +4174,7 @@ dependencies = [ [[package]] name = "rattler" version = "0.33.6" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "anyhow", "clap", @@ -4319,7 +4319,7 @@ dependencies = [ [[package]] name = "rattler_cache" version = "0.3.18" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "anyhow", "dashmap", @@ -4350,7 +4350,7 @@ dependencies = [ [[package]] name = "rattler_conda_types" version = "0.33.0" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "chrono", "core-foundation 0.10.0", @@ -4389,7 +4389,7 @@ dependencies = [ [[package]] name = "rattler_digest" version = "1.1.1" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "blake2", "digest", @@ -4406,7 +4406,7 @@ dependencies = [ [[package]] name = "rattler_index" version = "0.22.6" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "anyhow", "bytes", @@ -4433,7 +4433,7 @@ dependencies = [ [[package]] name = "rattler_macros" version = "1.0.8" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "quote", "syn", @@ -4442,7 +4442,7 @@ dependencies = [ [[package]] name = "rattler_menuinst" version = "0.2.8" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "chrono", "configparser", @@ -4471,7 +4471,7 @@ dependencies = [ [[package]] name = "rattler_networking" version = "0.23.0" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "anyhow", "async-trait", @@ -4500,7 +4500,7 @@ dependencies = [ [[package]] name = "rattler_package_streaming" version = "0.22.37" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "bzip2", "chrono", @@ -4529,7 +4529,7 @@ dependencies = [ [[package]] name = "rattler_pty" version = "0.2.0" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "libc", "nix", @@ -4539,7 +4539,7 @@ dependencies = [ [[package]] name = "rattler_redaction" version = "0.1.10" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "reqwest", "reqwest-middleware", @@ -4549,7 +4549,7 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" version = "0.22.6" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "anyhow", "async-compression", @@ -4605,7 +4605,7 @@ dependencies = [ [[package]] name = "rattler_sandbox" version = "0.1.7" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "birdcage", "clap", @@ -4616,7 +4616,7 @@ dependencies = [ [[package]] name = "rattler_shell" version = "0.23.0" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "anyhow", "enum_dispatch", @@ -4636,7 +4636,7 @@ dependencies = [ [[package]] name = "rattler_solve" version = "1.4.6" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "chrono", "futures", @@ -4653,7 +4653,7 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" version = "2.0.11" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "archspec", "libloading", @@ -5665,7 +5665,7 @@ dependencies = [ [[package]] name = "simple_spawn_blocking" version = "1.1.0" -source = "git+https://github.com/pavelzw/rattler?branch=bump-zip#07e06fa2dcc0582f89e15b68b53a2fa567053c91" +source = "git+https://github.com/conda/rattler?branch=main#0160a2f88129935ced52596ab795389f70164557" dependencies = [ "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index 66a86cb86..015d50e57 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -171,7 +171,7 @@ rattler_solve = { version = "1.4.5", default-features = false, features = [ "serde", ] } rattler_virtual_packages = { version = "2.0.10", default-features = false } -rattler_package_streaming = { version = "0.22.36", default-features = false } +rattler_package_streaming = { version = "0.22.37", default-features = false } rattler_menuinst = "0.2.7" lazy_static = "1.5.0" reqwest-retry = "0.7.0" @@ -204,17 +204,17 @@ name = "parse_file" harness = false [patch.crates-io] -rattler = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } -rattler_sandbox = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } -rattler_cache = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } -rattler_conda_types = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } -rattler_digest = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } -rattler_index = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } -rattler_networking = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } -rattler_repodata_gateway = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } -rattler_shell = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } -rattler_solve = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } -rattler_redaction = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } -rattler_virtual_packages = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } -rattler_package_streaming = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } -rattler_menuinst = { git = "https://github.com/pavelzw/rattler", branch = "bump-zip" } +rattler = { git = "https://github.com/conda/rattler", branch = "main" } +rattler_sandbox = { 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_shell = { git = "https://github.com/conda/rattler", branch = "main" } +rattler_solve = { git = "https://github.com/conda/rattler", branch = "main" } +rattler_redaction = { 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_menuinst = { git = "https://github.com/conda/rattler", branch = "main" }