From b8a9335f39f4085f38b1cbd22a1dc63e4c6cef3e Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Mon, 18 Nov 2024 17:33:10 +0100 Subject: [PATCH] prepare release 0.31.0 (#1197) --- Cargo.lock | 115 ++++++++++++---------------- Cargo.toml | 32 ++++---- src/metadata.rs | 7 +- src/package_test/run_test.rs | 5 +- src/render/resolved_dependencies.rs | 8 +- src/render/solver.rs | 12 +-- src/tool_configuration.rs | 1 + 7 files changed, 84 insertions(+), 96 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8b9f003c..a2012c19 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -516,9 +516,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" dependencies = [ "memchr", "serde", @@ -628,9 +628,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", @@ -703,9 +703,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -713,9 +713,9 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e099138e1807662ff75e2cebe4ae2287add879245574489f9b1588eb5e5564ed" +checksum = "34c77f67047557f62582784fd7482884697731b2932c7d37ced54bce2312e1e2" dependencies = [ "clap", "log", @@ -723,9 +723,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -735,9 +735,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11611dca53440593f38e6b25ec629de50b14cdfa63adc0fb856115a2c6d97595" +checksum = "d9647a559c112175f17cf724dc72d3645680a883c58481332779192b0d8e7a01" dependencies = [ "clap", ] @@ -766,9 +766,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "colorchoice" @@ -778,12 +778,11 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "comfy-table" -version = "7.1.2" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d05af1e006a2407bedef5af410552494ce5be9090444dbbcb57258c1af3d56" +checksum = "24f165e7b643266ea80cb858aed492ad9280e3e05ce24d4a99d7d7b889b6a4d9" dependencies = [ - "crossterm 0.27.0", - "crossterm 0.28.1", + "crossterm", "strum", "strum_macros", "unicode-width 0.2.0", @@ -915,19 +914,6 @@ version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags", - "crossterm_winapi", - "libc", - "parking_lot", - "winapi", -] - [[package]] name = "crossterm" version = "0.28.1" @@ -1336,9 +1322,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -2408,9 +2394,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.162" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "libdbus-sys" @@ -3460,7 +3446,7 @@ dependencies = [ "bitflags", "cassowary", "compact_str", - "crossterm 0.28.1", + "crossterm", "indoc", "instability", "itertools 0.13.0", @@ -3474,9 +3460,9 @@ dependencies = [ [[package]] name = "rattler" -version = "0.28.0" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd22dfa274c4d52295491906de6eaebc7e50ad60ffa63f15923f7a5c86278b09" +checksum = "cc6ca19634f93d07ab9c4346bd0f6fc0cd47dc90d993ee9dba9dc25c9b027c0b" dependencies = [ "anyhow", "clap", @@ -3515,7 +3501,7 @@ dependencies = [ [[package]] name = "rattler-build" -version = "0.30.0" +version = "0.31.0" dependencies = [ "ansi-to-tui", "anyhow", @@ -3531,7 +3517,7 @@ dependencies = [ "comfy-table", "console", "content_inspector", - "crossterm 0.28.1", + "crossterm", "dunce", "flate2", "fs-err 3.0.0", @@ -3607,9 +3593,9 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e57222ac28f224f675de54452b239f532e4f55ea36836526ae75e5a73cce01" +checksum = "ba32a7e932f934aea41983ad0c2a3513868c67881299038737fe070e13016166" dependencies = [ "anyhow", "dashmap", @@ -3635,9 +3621,9 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.29.0" +version = "0.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3679ee51d7869950d778b2acab10df50fa0b52a0acbb00d9ca95e880e5a2bb95" +checksum = "157b9dca7f9ed5bf7f04202fdd9fda5d8a76f76e937a3b6fd94ed8b2d55565bc" dependencies = [ "chrono", "dirs", @@ -3704,9 +3690,9 @@ dependencies = [ [[package]] name = "rattler_index" -version = "0.19.34" +version = "0.19.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0b9c029d12289236d3c6509aada6822fa99ae549894eafe1e218af64ae4a20" +checksum = "0a805fc30cc208c5a45a722b3818a83175e1de2e3a6e3f4e0b8454a4f9183651" dependencies = [ "fs-err 3.0.0", "rattler_conda_types", @@ -3818,9 +3804,9 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.22.11" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c46c1c690a668ed3bb740b078192301931a99126d4892748839535f2018b0c81" +checksum = "1785f4002ed6d58892d3c61b88ce43b708ae37d4d2c656f000e2dfa61a18c21b" dependencies = [ "bzip2", "chrono", @@ -3857,9 +3843,9 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.21.20" +version = "0.21.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e316533e0c55bfdafae25d99df14474cf9c18700c05010215b2c2da774d1c3d2" +checksum = "6115088f79b0048d1185b858438e077a4bce24c00589255c5eed8cd2eb46cd44" dependencies = [ "anyhow", "async-compression", @@ -3912,11 +3898,12 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.22.5" +version = "0.22.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dc935692eedf40b7135827b0eca92872b4f26c321c8a47d6f59d5fd99aaf09" +checksum = "47fbaf13fcf46e10c72c266f975f9d979e13bfe4ff159e4778b2357cf0ac2530" dependencies = [ "enum_dispatch", + "fs-err 3.0.0", "indexmap 2.6.0", "itertools 0.13.0", "rattler_conda_types", @@ -3930,9 +3917,9 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "1.2.1" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d16d28bcd47da6e2b6871a995da9974ccfbcb9fad81bc819e19c7bb6f5d593" +checksum = "102a559fb323891fb8e6438174c808d2a7e10d757d19c7a0b00fe240d8493ea2" dependencies = [ "chrono", "futures", @@ -3949,9 +3936,9 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "1.1.8" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dea1e5f560e837bba8c540c4595f4fc59a6671549637bf94aa6626c2cc519f7" +checksum = "2fef9adbeaf928423267ebd93d260b11dbc97999fcdf688e8c03a6d23c871a9e" dependencies = [ "archspec", "libloading", @@ -4309,9 +4296,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.16" +version = "0.23.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e" dependencies = [ "once_cell", "ring", @@ -4513,9 +4500,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "indexmap 2.6.0", "itoa", @@ -4695,9 +4682,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simd-json" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1df0290e9bfe79ddd5ff8798ca887cd107b75353d2957efe9777296e17f26b5" +checksum = "aa2bcf6c6e164e81bc7a5d49fc6988b3d515d9e8c07457d7b74ffb9324b9cd40" dependencies = [ "getrandom", "halfbrown", @@ -4794,9 +4781,9 @@ dependencies = [ [[package]] name = "spdx" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47317bbaf63785b53861e1ae2d11b80d6b624211d42cb20efcd210ee6f8a14bc" +checksum = "bae30cc7bfe3656d60ee99bf6836f472b0c53dddcbf335e253329abb16e535a2" dependencies = [ "smallvec", ] diff --git a/Cargo.toml b/Cargo.toml index 2cf1c523..41b2c31d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust-tests"] [package] name = "rattler-build" -version = "0.30.0" +version = "0.31.0" authors = ["rattler-build contributors "] homepage = "https://github.com/prefix-dev/rattler-build" edition = "2021" @@ -62,7 +62,7 @@ content_inspector = "0.2.4" serde_with = "3.11.0" url = "2.5.3" tracing = "0.1.40" -clap = { version = "4.5.20", features = ["derive", "env", "cargo"] } +clap = { version = "4.5.21", features = ["derive", "env", "cargo"] } minijinja = { version = "=2.4.0", features = [ "unstable_machinery", "custom_syntax", @@ -79,7 +79,7 @@ num_cpus = "1.16.0" goblin = "0.9.2" scroll = "0.12.0" pathdiff = "0.2.2" -comfy-table = "7.1.2" +comfy-table = "7.1.3" futures = "0.3.31" indicatif = "0.17.9" console = { version = "0.15.8", features = ["windows-console-colors"] } @@ -87,17 +87,17 @@ thiserror = "2.0.3" tempfile = "3.14.0" chrono = "0.4.38" sha1 = "0.10.6" -spdx = "0.10.6" +spdx = "0.10.7" ignore = "0.4.23" globset = "0.4.15" -clap-verbosity-flag = "2.2.2" +clap-verbosity-flag = "2.2.3" tracing-core = "0.1.32" petgraph = "0.6.5" indexmap = "2.6.0" dunce = "1.0.5" fs-err = "3.0.0" which = "7.0.0" -clap_complete = "4.5.37" +clap_complete = "4.5.38" clap_complete_nushell = "4.5.4" tokio-util = "0.7.12" @@ -108,7 +108,7 @@ zip = { version = "2.2.0", default-features = false, features = [ ] } bzip2 = "0.4.4" base64 = "0.22.1" -flate2 = "1.0.34" +flate2 = "1.0.35" xz2 = "0.1.7" zstd = "0.13.2" toml = "0.8.19" @@ -130,18 +130,18 @@ regex = "1.11.1" async-recursion = "1.1.1" # Rattler crates -rattler = { version = "0.28.0", default-features = false, features = ["cli-tools", "indicatif"] } -rattler_cache = { version = "0.2.8", default-features = false } -rattler_conda_types = { version = "0.29.0", default-features = false } +rattler = { version = "0.28.2", default-features = false, features = ["cli-tools", "indicatif"] } +rattler_cache = { version = "0.2.10", default-features = false } +rattler_conda_types = { version = "0.29.2", default-features = false } rattler_digest = { version = "1.0.3", default-features = false, features = ["serde"] } -rattler_index = { version = "0.19.34", default-features = false } +rattler_index = { version = "0.19.36", default-features = false } rattler_networking = { version = "0.21.5", default-features = false } rattler_redaction = { version = "0.1.3" } -rattler_repodata_gateway = { version = "0.21.20", default-features = false, features = ["gateway"] } -rattler_shell = { version = "0.22.5", default-features = false, features = ["sysinfo"] } -rattler_solve = { version = "1.2.1", default-features = false, features = ["resolvo", "serde"] } -rattler_virtual_packages = { version = "1.1.8", default-features = false } -rattler_package_streaming = { version = "0.22.11", default-features = false } +rattler_repodata_gateway = { version = "0.21.22", default-features = false, features = ["gateway"] } +rattler_shell = { version = "0.22.7", default-features = false, features = ["sysinfo"] } +rattler_solve = { version = "1.2.3", default-features = false, features = ["resolvo", "serde"] } +rattler_virtual_packages = { version = "1.1.10", default-features = false } +rattler_package_streaming = { version = "0.22.13", default-features = false } lazy_static = "1.5.0" [dev-dependencies] diff --git a/src/metadata.rs b/src/metadata.rs index 203fa30e..180784c6 100644 --- a/src/metadata.rs +++ b/src/metadata.rs @@ -16,7 +16,7 @@ use fs_err as fs; use indicatif::HumanBytes; use rattler_conda_types::{ package::{ArchiveType, PathType, PathsEntry, PathsJson}, - Channel, GenericVirtualPackage, PackageName, Platform, RepoDataRecord, Version, + Channel, ChannelUrl, GenericVirtualPackage, PackageName, Platform, RepoDataRecord, Version, }; use rattler_index::index; use rattler_package_streaming::write::CompressionLevel; @@ -27,7 +27,6 @@ use rattler_virtual_packages::{ }; use serde::{Deserialize, Deserializer, Serialize}; use serde_json::Value; -use url::Url; use crate::{ console_utils::github_integration_enabled, @@ -321,7 +320,7 @@ pub struct BuildConfiguration { /// The directories for the build (work, source, build, host, ...) pub directories: Directories, /// The channels to use when resolving environments - pub channels: Vec, + pub channels: Vec, /// The channel priority that is used to resolve dependencies pub channel_priority: ChannelPriority, /// The solve strategy to use when resolving dependencies @@ -707,7 +706,7 @@ impl Display for Output { pub fn build_reindexed_channels( build_configuration: &BuildConfiguration, tool_configuration: &tool_configuration::Configuration, -) -> Result, std::io::Error> { +) -> Result, std::io::Error> { let output_dir = &build_configuration.directories.output_dir; let output_channel = Channel::from_directory(output_dir); diff --git a/src/package_test/run_test.rs b/src/package_test/run_test.rs index b0805f67..7dc54634 100644 --- a/src/package_test/run_test.rs +++ b/src/package_test/run_test.rs @@ -20,7 +20,7 @@ use fs_err as fs; use rattler::package_cache::CacheKey; use rattler_conda_types::{ package::{ArchiveIdentifier, IndexJson, PackageFile}, - Channel, MatchSpec, ParseStrictness, Platform, + Channel, ChannelUrl, MatchSpec, ParseStrictness, Platform, }; use rattler_index::index; use rattler_shell::{ @@ -28,7 +28,6 @@ use rattler_shell::{ shell::{Shell, ShellEnum}, }; use rattler_solve::{ChannelPriority, SolveStrategy}; -use url::Url; use crate::{ env_vars, @@ -204,7 +203,7 @@ pub struct TestConfiguration { pub keep_test_prefix: bool, /// The channels to use for the test – do not forget to add the local build /// outputs channel if desired - pub channels: Vec, + pub channels: Vec, /// The channel priority that is used to resolve dependencies pub channel_priority: ChannelPriority, /// The solve strategy to use when resolving dependencies diff --git a/src/render/resolved_dependencies.rs b/src/render/resolved_dependencies.rs index e26b877f..d6c94b71 100644 --- a/src/render/resolved_dependencies.rs +++ b/src/render/resolved_dependencies.rs @@ -10,15 +10,15 @@ use indicatif::{HumanBytes, MultiProgress, ProgressBar}; use rattler::install::Placement; use rattler_cache::package_cache::PackageCache; use rattler_conda_types::{ - package::RunExportsJson, version_spec::ParseVersionSpecError, MatchSpec, PackageName, - PackageRecord, ParseStrictness, Platform, RepoDataRecord, StringMatcher, VersionSpec, + package::RunExportsJson, version_spec::ParseVersionSpecError, ChannelUrl, MatchSpec, + PackageName, PackageRecord, ParseStrictness, Platform, RepoDataRecord, StringMatcher, + VersionSpec, }; use reqwest_middleware::ClientWithMiddleware; use serde::{Deserialize, Serialize}; use serde_with::{serde_as, DisplayFromStr}; use thiserror::Error; use tokio::sync::{mpsc, Semaphore}; -use url::Url; use super::pin::PinError; use crate::{ @@ -669,7 +669,7 @@ fn render_run_exports( pub(crate) async fn resolve_dependencies( requirements: &Requirements, output: &Output, - channels: &[Url], + channels: &[ChannelUrl], tool_configuration: &tool_configuration::Configuration, ) -> Result { let merge_build_host = output.recipe.build().merge_build_and_host_envs(); diff --git a/src/render/solver.rs b/src/render/solver.rs index a4aac14a..123b647b 100644 --- a/src/render/solver.rs +++ b/src/render/solver.rs @@ -11,7 +11,7 @@ use futures::FutureExt; use indicatif::{HumanBytes, ProgressBar, ProgressStyle}; use itertools::Itertools; use rattler::install::{DefaultProgressFormatter, IndicatifReporter, Installer}; -use rattler_conda_types::{Channel, MatchSpec, Platform, RepoDataRecord}; +use rattler_conda_types::{Channel, ChannelUrl, MatchSpec, Platform, RepoDataRecord}; use rattler_solve::{resolvo::Solver, ChannelPriority, SolveStrategy, SolverImpl, SolverTask}; use url::Url; @@ -59,7 +59,7 @@ pub async fn solve_environment( name: &str, specs: &[MatchSpec], target_platform: &PlatformWithVirtualPackages, - channels: &[Url], + channels: &[ChannelUrl], tool_configuration: &tool_configuration::Configuration, channel_priority: ChannelPriority, solve_strategy: SolveStrategy, @@ -76,7 +76,9 @@ pub async fn solve_environment( for channel in channels { tracing::info!( " - {}", - tool_configuration.channel_config.canonical_name(channel) + tool_configuration + .channel_config + .canonical_name(channel.url()) ); } tracing::info!(" Specs:"); @@ -123,7 +125,7 @@ pub async fn create_environment( specs: &[MatchSpec], target_platform: &PlatformWithVirtualPackages, target_prefix: &Path, - channels: &[Url], + channels: &[ChannelUrl], tool_configuration: &tool_configuration::Configuration, channel_priority: ChannelPriority, solve_strategy: SolveStrategy, @@ -244,7 +246,7 @@ impl GatewayReporterBuilder { /// Load repodata from channels. Only includes necessary records for platform & /// specs. pub async fn load_repodatas( - channels: &[Url], + channels: &[ChannelUrl], target_platform: Platform, specs: &[MatchSpec], tool_configuration: &tool_configuration::Configuration, diff --git a/src/tool_configuration.rs b/src/tool_configuration.rs index 61e1d0e0..314c93e2 100644 --- a/src/tool_configuration.rs +++ b/src/tool_configuration.rs @@ -292,6 +292,7 @@ impl ConfigurationBuilder { jlap_enabled: true, zstd_enabled: self.use_zstd, bz2_enabled: self.use_bz2, + sharded_enabled: true, cache_action: Default::default(), }, per_channel: Default::default(),