From c3eb3d9cbd63f8b78f1fb894cb6ff9a187192acc Mon Sep 17 00:00:00 2001 From: nichmor Date: Wed, 19 Feb 2025 18:14:49 +0200 Subject: [PATCH 1/5] feat: extract only run-archive --- Cargo.lock | 51 +++++++++++------------------ Cargo.toml | 26 +++++++-------- src/render/resolved_dependencies.rs | 14 ++++---- src/run_exports.rs | 43 +++++++++++++----------- src/tool_configuration.rs | 7 ++++ 5 files changed, 68 insertions(+), 73 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 54c254cd3..5f89667c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1693,8 +1693,7 @@ dependencies = [ [[package]] name = "file_url" version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f75ca0511313d95b0ca15b916b4532975b31b92ed882ddeaa23cbfca4955f32a" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "itertools 0.14.0", "percent-encoding", @@ -3856,8 +3855,7 @@ dependencies = [ [[package]] name = "rattler" version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5f53a286c4dee652b3e986fd0a03f662d45f01e476f0bcbdd0874e8d892563" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "anyhow", "clap", @@ -3995,8 +3993,7 @@ dependencies = [ [[package]] name = "rattler_cache" version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453b425cfea126dc62839ad6e40e1125020989489a2dc2069cf16d5cf2a8e0fd" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "anyhow", "dashmap", @@ -4015,7 +4012,9 @@ dependencies = [ "rayon", "reqwest", "reqwest-middleware", + "serde_json", "simple_spawn_blocking", + "tempfile", "thiserror 2.0.11", "tokio", "tracing", @@ -4025,8 +4024,7 @@ dependencies = [ [[package]] name = "rattler_conda_types" version = "0.30.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d52bc8c582e96cf777fd5ae74de7e247aff99608ed1ba54b8afd918254a180f" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "chrono", "dirs", @@ -4064,8 +4062,7 @@ dependencies = [ [[package]] name = "rattler_digest" version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da135964124c18d81b9b02864e027e4f993881fa782c876c443bafb2e35ebc2f" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "blake2", "digest", @@ -4081,8 +4078,7 @@ dependencies = [ [[package]] name = "rattler_index" version = "0.20.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c156e10ff8190f6c6a9c7cbf25b2b7323e1db15f6ba93b8b74105e156cd48735" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "fs-err", "rattler_conda_types", @@ -4097,8 +4093,7 @@ dependencies = [ [[package]] name = "rattler_macros" version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382cfcb2acfcdd5a0d7efdbb86705e03435c76c784f404d78b517649b522d244" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "quote", "syn", @@ -4107,8 +4102,7 @@ dependencies = [ [[package]] name = "rattler_networking" version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ead7c1cbbf911d244656016a50533511156e95514e01c92af83a4f083a5bff" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "anyhow", "async-trait", @@ -4137,8 +4131,7 @@ dependencies = [ [[package]] name = "rattler_package_streaming" version = "0.22.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d425d69e2f3bb74e1714ddcddfc9ea239e262c03287a6d4f85cb2310fda2ac" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "bzip2 0.5.1", "chrono", @@ -4152,6 +4145,7 @@ dependencies = [ "reqwest", "reqwest-middleware", "serde_json", + "simple_spawn_blocking", "tar", "tempfile", "thiserror 2.0.11", @@ -4166,8 +4160,7 @@ dependencies = [ [[package]] name = "rattler_redaction" version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2602372bcb67b3046098075fdee8507484545d4a9604918afdee003fd8db5b" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "reqwest", "reqwest-middleware", @@ -4177,8 +4170,7 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" version = "0.21.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc074e814745f22fc2d3d23d711581f14ffb7d37c68520df8685d712637a62a2" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "anyhow", "async-compression", @@ -4233,8 +4225,7 @@ dependencies = [ [[package]] name = "rattler_sandbox" version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39339447da626331852b0c1d889434fdc364595ddca6a7af6b8e58c5d736737a" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "birdcage", "clap", @@ -4245,8 +4236,7 @@ dependencies = [ [[package]] name = "rattler_shell" version = "0.22.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a26f07860b788b3dfc14b86736e79028b75483d3834ec41d2aba2f5529a86" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "enum_dispatch", "fs-err", @@ -4264,8 +4254,7 @@ dependencies = [ [[package]] name = "rattler_solve" version = "1.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90d56b5bc5c97ba1ac45002fd368dc685f9312f9c0bb7bc522fe609fd91e1603" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "chrono", "futures", @@ -4284,8 +4273,7 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397e6658e354206c2d9fdb88ab9dafcce76388f7047a55262b41d14ca5867daa" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "archspec", "libloading", @@ -5228,8 +5216,7 @@ dependencies = [ [[package]] name = "simple_spawn_blocking" version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b31ed96d1593e129cc76cb7aca364fb5c173558bfda922c15aac4e2f2f5844e" +source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" dependencies = [ "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index ba8ff81de..91ee3a0ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -197,16 +197,16 @@ pre-build = [ # this fork contains fixes for slow zip reading and large file writing zip = { git = "https://github.com/wolfv/zip2", branch = "patched" } -# rattler = { git = "https://github.com/conda/rattler", branch = "main" } -# rattler_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 = { 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" } diff --git a/src/render/resolved_dependencies.rs b/src/render/resolved_dependencies.rs index 36707e528..374028fee 100644 --- a/src/render/resolved_dependencies.rs +++ b/src/render/resolved_dependencies.rs @@ -7,7 +7,7 @@ use std::{ use indicatif::{HumanBytes, MultiProgress, ProgressBar}; use rattler::install::Placement; -use rattler_cache::package_cache::PackageCache; +use rattler_cache::run_exports_cache::RunExportsCache; use rattler_conda_types::{ package::RunExportsJson, ChannelUrl, MatchSpec, NamelessMatchSpec, PackageName, PackageRecord, Platform, RepoDataRecord, @@ -522,13 +522,11 @@ pub fn apply_variant( /// Collect run exports from the package cache and add them to the package /// records. /// TODO: There are many ways that would allow us to optimize this function. -/// 1. This currently downloads an entire package, but we only need the -/// `run_exports.json`. -/// 2. There are special run_exports.json files available for some channels. +/// 1. There are special run_exports.json files available for some channels. async fn amend_run_exports( records: &mut [RepoDataRecord], client: ClientWithMiddleware, - package_cache: PackageCache, + run_exports_cache: RunExportsCache, multi_progress: MultiProgress, progress_prefix: impl Into>, top_level_pb: Option, @@ -551,7 +549,7 @@ async fn amend_run_exports( let extractor = RunExportExtractor::default() .with_max_concurrent_requests(max_concurrent_requests.clone()) .with_client(client.clone()) - .with_package_cache(package_cache.clone(), progress.clone()); + .with_run_exports_cache(run_exports_cache.clone(), progress.clone()); let tx = tx.clone(); let record = pkg.clone(); @@ -692,7 +690,7 @@ pub(crate) async fn resolve_dependencies( amend_run_exports( &mut resolved, tool_configuration.client.clone(), - tool_configuration.package_cache.clone(), + tool_configuration.run_exports_cache.clone(), tool_configuration .fancy_log_handler .multi_progress() @@ -788,7 +786,7 @@ pub(crate) async fn resolve_dependencies( amend_run_exports( &mut resolved, tool_configuration.client.clone(), - tool_configuration.package_cache.clone(), + tool_configuration.run_exports_cache.clone(), tool_configuration .fancy_log_handler .multi_progress() diff --git a/src/run_exports.rs b/src/run_exports.rs index a0348d1ad..1aad314da 100644 --- a/src/run_exports.rs +++ b/src/run_exports.rs @@ -1,11 +1,10 @@ use std::sync::Arc; use futures::future::OptionFuture; -use rattler_cache::package_cache::{CacheKey, PackageCache, PackageCacheError}; -use rattler_conda_types::{ - package::{PackageFile, RunExportsJson}, - RepoDataRecord, +use rattler_cache::run_exports_cache::{ + CacheKey, CacheKeyError, RunExportsCache, RunExportsCacheError, }; +use rattler_conda_types::{package::RunExportsJson, RepoDataRecord}; use rattler_networking::retry_policies::default_retry_policy; use reqwest_middleware::ClientWithMiddleware; use thiserror::Error; @@ -20,14 +19,17 @@ use crate::package_cache_reporter::PackageCacheReporter; #[derive(Default)] pub struct RunExportExtractor { max_concurrent_requests: Option>, - package_cache: Option<(PackageCache, PackageCacheReporter)>, + run_exports_cache: Option<(RunExportsCache, PackageCacheReporter)>, client: Option, } #[derive(Debug, Error)] pub enum RunExportExtractorError { #[error(transparent)] - PackageCache(#[from] PackageCacheError), + RunExportsCache(#[from] RunExportsCacheError), + + #[error(transparent)] + CacheKey(#[from] CacheKeyError), #[error("the operation was cancelled")] Cancelled, @@ -43,15 +45,15 @@ impl RunExportExtractor { } } - /// Set the package cache that the extractor can use as well as a reporter + /// Set the run exports cache that the extractor can use as well as a reporter /// to allow progress reporting. - pub fn with_package_cache( + pub fn with_run_exports_cache( self, - package_cache: PackageCache, + run_exports_cache: RunExportsCache, reporter: PackageCacheReporter, ) -> Self { Self { - package_cache: Some((package_cache, reporter)), + run_exports_cache: Some((run_exports_cache, reporter)), ..self } } @@ -70,24 +72,25 @@ impl RunExportExtractor { mut self, record: &RepoDataRecord, ) -> Result, RunExportExtractorError> { - self.extract_into_package_cache(record).await + self.extract_into_run_exports_cache(record).await } - /// Extract the run exports from a package by downloading it to the cache - /// and then reading the run_exports.json file. - async fn extract_into_package_cache( + /// Extract the run exports from a package by downloading and extracting only the run_exports.json file into the cache. + async fn extract_into_run_exports_cache( &mut self, record: &RepoDataRecord, ) -> Result, RunExportExtractorError> { - let Some((package_cache, mut package_cache_reporter)) = self.package_cache.clone() else { + let Some((run_exports_cache, mut run_exports_cache_reporter)) = + self.run_exports_cache.clone() + else { return Ok(None); }; let Some(client) = self.client.clone() else { return Ok(None); }; - let progress_reporter = package_cache_reporter.add(record); - let cache_key = CacheKey::from(&record.package_record); + let progress_reporter = run_exports_cache_reporter.add(record); + let cache_key = CacheKey::create(&record.package_record, &record.file_name)?; let url = record.url.clone(); let max_concurrent_requests = self.max_concurrent_requests.clone(); @@ -96,9 +99,9 @@ impl RunExportExtractor { .transpose() .expect("semaphore error"); - match package_cache + match run_exports_cache .get_or_fetch_from_url_with_retry( - cache_key, + &cache_key, url, client, default_retry_policy(), @@ -106,7 +109,7 @@ impl RunExportExtractor { ) .await { - Ok(package_dir) => Ok(RunExportsJson::from_package_directory(package_dir.path()).ok()), + Ok(cached_run_exports) => Ok(cached_run_exports.run_exports()), Err(e) => Err(e.into()), } } diff --git a/src/tool_configuration.rs b/src/tool_configuration.rs index 1802ed850..21e65005d 100644 --- a/src/tool_configuration.rs +++ b/src/tool_configuration.rs @@ -5,6 +5,7 @@ use std::{path::PathBuf, sync::Arc}; use clap::ValueEnum; use rattler::package_cache::PackageCache; +use rattler_cache::run_exports_cache::RunExportsCache; use rattler_conda_types::{ChannelConfig, Platform}; use rattler_networking::{ authentication_storage::{self, AuthenticationStorageError}, @@ -84,6 +85,9 @@ pub struct Configuration { /// The package cache to use to store packages in. pub package_cache: PackageCache, + /// The run exports cache to use to store run exports in. + pub run_exports_cache: RunExportsCache, + /// The repodata gateway to use for querying repodata pub repodata_gateway: Gateway, @@ -298,6 +302,8 @@ impl ConfigurationBuilder { reqwest_client_from_auth_storage(None).expect("failed to create client") }); let package_cache = PackageCache::new(cache_dir.join(rattler_cache::PACKAGE_CACHE_DIR)); + let run_exports_cache = + RunExportsCache::new(cache_dir.join(rattler_cache::RUN_EXPORTS_CACHE_DIR)); let channel_config = self.channel_config.unwrap_or_else(|| { ChannelConfig::default_with_root_dir( std::env::current_dir().unwrap_or_else(|_err| PathBuf::from("/")), @@ -336,6 +342,7 @@ impl ConfigurationBuilder { channel_config, compression_threads: self.compression_threads, package_cache, + run_exports_cache, repodata_gateway, channel_priority: self.channel_priority, } From 511e7cc165a217157155e4c22dcf6bb8bc0bd491 Mon Sep 17 00:00:00 2001 From: nichmor Date: Thu, 20 Feb 2025 10:48:10 +0200 Subject: [PATCH 2/5] misc: point to rattler that handle file --- Cargo.lock | 32 ++++++++++++++++---------------- Cargo.toml | 26 +++++++++++++------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5f89667c3..5004be76b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1693,7 +1693,7 @@ dependencies = [ [[package]] name = "file_url" version = "0.2.3" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "itertools 0.14.0", "percent-encoding", @@ -3855,7 +3855,7 @@ dependencies = [ [[package]] name = "rattler" version = "0.32.0" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "anyhow", "clap", @@ -3993,7 +3993,7 @@ dependencies = [ [[package]] name = "rattler_cache" version = "0.3.9" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "anyhow", "dashmap", @@ -4024,7 +4024,7 @@ dependencies = [ [[package]] name = "rattler_conda_types" version = "0.30.3" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "chrono", "dirs", @@ -4062,7 +4062,7 @@ dependencies = [ [[package]] name = "rattler_digest" version = "1.0.6" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "blake2", "digest", @@ -4078,7 +4078,7 @@ dependencies = [ [[package]] name = "rattler_index" version = "0.20.12" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "fs-err", "rattler_conda_types", @@ -4093,7 +4093,7 @@ dependencies = [ [[package]] name = "rattler_macros" version = "1.0.6" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "quote", "syn", @@ -4102,7 +4102,7 @@ dependencies = [ [[package]] name = "rattler_networking" version = "0.22.4" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "anyhow", "async-trait", @@ -4131,7 +4131,7 @@ dependencies = [ [[package]] name = "rattler_package_streaming" version = "0.22.28" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "bzip2 0.5.1", "chrono", @@ -4160,7 +4160,7 @@ dependencies = [ [[package]] name = "rattler_redaction" version = "0.1.6" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "reqwest", "reqwest-middleware", @@ -4170,7 +4170,7 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" version = "0.21.37" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "anyhow", "async-compression", @@ -4225,7 +4225,7 @@ dependencies = [ [[package]] name = "rattler_sandbox" version = "0.1.3" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "birdcage", "clap", @@ -4236,7 +4236,7 @@ dependencies = [ [[package]] name = "rattler_shell" version = "0.22.19" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "enum_dispatch", "fs-err", @@ -4254,7 +4254,7 @@ dependencies = [ [[package]] name = "rattler_solve" version = "1.3.8" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "chrono", "futures", @@ -4273,7 +4273,7 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" version = "2.0.3" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "archspec", "libloading", @@ -5216,7 +5216,7 @@ dependencies = [ [[package]] name = "simple_spawn_blocking" version = "1.0.0" -source = "git+https://github.com/conda/rattler?branch=main#70a2319879040667652e962aecb2d9a2ebfc05a9" +source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index 91ee3a0ff..2d1007857 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -197,16 +197,16 @@ pre-build = [ # this fork contains fixes for slow zip reading and large file writing zip = { git = "https://github.com/wolfv/zip2", branch = "patched" } -rattler = { git = "https://github.com/conda/rattler", branch = "main" } -rattler_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 = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_sandbox = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_cache = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_conda_types = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_digest = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_index = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_networking = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_repodata_gateway = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_shell = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_solve = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_redaction = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_virtual_packages = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_package_streaming = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } From ec32904c595c3f7aa964f1730fd9d6cc47aeca37 Mon Sep 17 00:00:00 2001 From: nichmor Date: Thu, 20 Feb 2025 11:07:57 +0200 Subject: [PATCH 3/5] misc: patch py-rattler-build --- py-rattler-build/Cargo.lock | 89 ++++++++++++++++--------------------- py-rattler-build/Cargo.toml | 14 ++++++ 2 files changed, 52 insertions(+), 51 deletions(-) diff --git a/py-rattler-build/Cargo.lock b/py-rattler-build/Cargo.lock index 753d05b1c..b7b360e0d 100644 --- a/py-rattler-build/Cargo.lock +++ b/py-rattler-build/Cargo.lock @@ -129,9 +129,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" +checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4" [[package]] name = "arbitrary" @@ -1629,8 +1629,7 @@ dependencies = [ [[package]] name = "file_url" version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f75ca0511313d95b0ca15b916b4532975b31b92ed882ddeaa23cbfca4955f32a" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "itertools 0.14.0", "percent-encoding", @@ -2976,9 +2975,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" dependencies = [ "libc", "log", @@ -3752,7 +3751,7 @@ checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.1", - "zerocopy 0.8.18", + "zerocopy 0.8.20", ] [[package]] @@ -3791,14 +3790,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a88e0da7a2c97baa202165137c158d0a2e824ac465d13d81046727b34cb247d3" dependencies = [ "getrandom 0.3.1", - "zerocopy 0.8.18", + "zerocopy 0.8.20", ] [[package]] name = "rattler" version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5f53a286c4dee652b3e986fd0a03f662d45f01e476f0bcbdd0874e8d892563" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "anyhow", "clap", @@ -3926,8 +3924,7 @@ dependencies = [ [[package]] name = "rattler_cache" version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453b425cfea126dc62839ad6e40e1125020989489a2dc2069cf16d5cf2a8e0fd" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "anyhow", "dashmap", @@ -3946,7 +3943,9 @@ dependencies = [ "rayon", "reqwest", "reqwest-middleware", + "serde_json", "simple_spawn_blocking", + "tempfile", "thiserror 2.0.11", "tokio", "tracing", @@ -3956,8 +3955,7 @@ dependencies = [ [[package]] name = "rattler_conda_types" version = "0.30.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d52bc8c582e96cf777fd5ae74de7e247aff99608ed1ba54b8afd918254a180f" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "chrono", "dirs", @@ -3995,8 +3993,7 @@ dependencies = [ [[package]] name = "rattler_digest" version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da135964124c18d81b9b02864e027e4f993881fa782c876c443bafb2e35ebc2f" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "blake2", "digest", @@ -4012,8 +4009,7 @@ dependencies = [ [[package]] name = "rattler_index" version = "0.20.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c156e10ff8190f6c6a9c7cbf25b2b7323e1db15f6ba93b8b74105e156cd48735" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "fs-err", "rattler_conda_types", @@ -4028,8 +4024,7 @@ dependencies = [ [[package]] name = "rattler_macros" version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382cfcb2acfcdd5a0d7efdbb86705e03435c76c784f404d78b517649b522d244" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "quote", "syn", @@ -4038,8 +4033,7 @@ dependencies = [ [[package]] name = "rattler_networking" version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ead7c1cbbf911d244656016a50533511156e95514e01c92af83a4f083a5bff" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "anyhow", "async-trait", @@ -4068,8 +4062,7 @@ dependencies = [ [[package]] name = "rattler_package_streaming" version = "0.22.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d425d69e2f3bb74e1714ddcddfc9ea239e262c03287a6d4f85cb2310fda2ac" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "bzip2 0.5.1", "chrono", @@ -4083,6 +4076,7 @@ dependencies = [ "reqwest", "reqwest-middleware", "serde_json", + "simple_spawn_blocking", "tar", "tempfile", "thiserror 2.0.11", @@ -4097,8 +4091,7 @@ dependencies = [ [[package]] name = "rattler_redaction" version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2602372bcb67b3046098075fdee8507484545d4a9604918afdee003fd8db5b" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "reqwest", "reqwest-middleware", @@ -4108,8 +4101,7 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" version = "0.21.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc074e814745f22fc2d3d23d711581f14ffb7d37c68520df8685d712637a62a2" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "anyhow", "async-compression", @@ -4164,8 +4156,7 @@ dependencies = [ [[package]] name = "rattler_sandbox" version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39339447da626331852b0c1d889434fdc364595ddca6a7af6b8e58c5d736737a" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "birdcage", "clap", @@ -4176,8 +4167,7 @@ dependencies = [ [[package]] name = "rattler_shell" version = "0.22.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a26f07860b788b3dfc14b86736e79028b75483d3834ec41d2aba2f5529a86" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "enum_dispatch", "fs-err", @@ -4195,8 +4185,7 @@ dependencies = [ [[package]] name = "rattler_solve" version = "1.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90d56b5bc5c97ba1ac45002fd368dc685f9312f9c0bb7bc522fe609fd91e1603" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "chrono", "futures", @@ -4215,8 +4204,7 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397e6658e354206c2d9fdb88ab9dafcce76388f7047a55262b41d14ca5867daa" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "archspec", "libloading", @@ -4809,9 +4797,9 @@ checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" [[package]] name = "serde" -version = "1.0.217" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" dependencies = [ "serde_derive", ] @@ -4829,9 +4817,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" dependencies = [ "proc-macro2", "quote", @@ -4840,9 +4828,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.138" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" +checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" dependencies = [ "indexmap 2.7.1", "itoa", @@ -5034,8 +5022,7 @@ dependencies = [ [[package]] name = "simple_spawn_blocking" version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b31ed96d1593e129cc76cb7aca364fb5c173558bfda922c15aac4e2f2f5844e" +source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" dependencies = [ "tokio", ] @@ -6351,9 +6338,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59690dea168f2198d1a3b0cac23b8063efcd11012f10ae4698f284808c8ef603" +checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1" dependencies = [ "memchr", ] @@ -6554,11 +6541,11 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.18" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79386d31a42a4996e3336b0919ddb90f81112af416270cff95b5f5af22b839c2" +checksum = "dde3bb8c68a8f3f1ed4ac9221aad6b10cece3e60a8e2ea54a6a2dec806d0084c" dependencies = [ - "zerocopy-derive 0.8.18", + "zerocopy-derive 0.8.20", ] [[package]] @@ -6574,9 +6561,9 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.8.18" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76331675d372f91bf8d17e13afbd5fe639200b73d01f0fc748bb059f9cca2db7" +checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700" dependencies = [ "proc-macro2", "quote", diff --git a/py-rattler-build/Cargo.toml b/py-rattler-build/Cargo.toml index 7c634fa34..81ce7da1c 100644 --- a/py-rattler-build/Cargo.toml +++ b/py-rattler-build/Cargo.toml @@ -37,6 +37,20 @@ pyo3-build-config = "0.23.4" [patch.crates-io] zip = { git = "https://github.com/wolfv/zip2", branch = "patched" } +rattler = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_sandbox = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_cache = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_conda_types = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_digest = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_index = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_networking = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_repodata_gateway = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_shell = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_solve = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_redaction = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_virtual_packages = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +rattler_package_streaming = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } + # Prevent package from thinking it's in the workspace [workspace] From 8d231d0184553edcfd1909a1ac585118255fa195 Mon Sep 17 00:00:00 2001 From: nichmor Date: Thu, 20 Feb 2025 11:24:05 +0200 Subject: [PATCH 4/5] misc: update cargo to include conda-rattler --- Cargo.lock | 32 ++++++++++++++++---------------- Cargo.toml | 26 +++++++++++++------------- py-rattler-build/Cargo.lock | 32 ++++++++++++++++---------------- py-rattler-build/Cargo.toml | 26 +++++++++++++------------- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5004be76b..dfe9666c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1693,7 +1693,7 @@ dependencies = [ [[package]] name = "file_url" version = "0.2.3" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "itertools 0.14.0", "percent-encoding", @@ -3855,7 +3855,7 @@ dependencies = [ [[package]] name = "rattler" version = "0.32.0" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "anyhow", "clap", @@ -3993,7 +3993,7 @@ dependencies = [ [[package]] name = "rattler_cache" version = "0.3.9" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "anyhow", "dashmap", @@ -4024,7 +4024,7 @@ dependencies = [ [[package]] name = "rattler_conda_types" version = "0.30.3" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "chrono", "dirs", @@ -4062,7 +4062,7 @@ dependencies = [ [[package]] name = "rattler_digest" version = "1.0.6" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "blake2", "digest", @@ -4078,7 +4078,7 @@ dependencies = [ [[package]] name = "rattler_index" version = "0.20.12" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "fs-err", "rattler_conda_types", @@ -4093,7 +4093,7 @@ dependencies = [ [[package]] name = "rattler_macros" version = "1.0.6" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "quote", "syn", @@ -4102,7 +4102,7 @@ dependencies = [ [[package]] name = "rattler_networking" version = "0.22.4" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "anyhow", "async-trait", @@ -4131,7 +4131,7 @@ dependencies = [ [[package]] name = "rattler_package_streaming" version = "0.22.28" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "bzip2 0.5.1", "chrono", @@ -4160,7 +4160,7 @@ dependencies = [ [[package]] name = "rattler_redaction" version = "0.1.6" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "reqwest", "reqwest-middleware", @@ -4170,7 +4170,7 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" version = "0.21.37" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "anyhow", "async-compression", @@ -4225,7 +4225,7 @@ dependencies = [ [[package]] name = "rattler_sandbox" version = "0.1.3" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "birdcage", "clap", @@ -4236,7 +4236,7 @@ dependencies = [ [[package]] name = "rattler_shell" version = "0.22.19" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "enum_dispatch", "fs-err", @@ -4254,7 +4254,7 @@ dependencies = [ [[package]] name = "rattler_solve" version = "1.3.8" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "chrono", "futures", @@ -4273,7 +4273,7 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" version = "2.0.3" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "archspec", "libloading", @@ -5216,7 +5216,7 @@ dependencies = [ [[package]] name = "simple_spawn_blocking" version = "1.0.0" -source = "git+https://github.com/nichmor/rattler?branch=misc/run-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index 2d1007857..91ee3a0ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -197,16 +197,16 @@ pre-build = [ # this fork contains fixes for slow zip reading and large file writing zip = { git = "https://github.com/wolfv/zip2", branch = "patched" } -rattler = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_sandbox = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_cache = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_conda_types = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_digest = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_index = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_networking = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_repodata_gateway = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_shell = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_solve = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_redaction = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_virtual_packages = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_package_streaming = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +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" } diff --git a/py-rattler-build/Cargo.lock b/py-rattler-build/Cargo.lock index b7b360e0d..78b5fe4e7 100644 --- a/py-rattler-build/Cargo.lock +++ b/py-rattler-build/Cargo.lock @@ -1629,7 +1629,7 @@ dependencies = [ [[package]] name = "file_url" version = "0.2.3" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "itertools 0.14.0", "percent-encoding", @@ -3796,7 +3796,7 @@ dependencies = [ [[package]] name = "rattler" version = "0.32.0" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "anyhow", "clap", @@ -3924,7 +3924,7 @@ dependencies = [ [[package]] name = "rattler_cache" version = "0.3.9" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "anyhow", "dashmap", @@ -3955,7 +3955,7 @@ dependencies = [ [[package]] name = "rattler_conda_types" version = "0.30.3" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "chrono", "dirs", @@ -3993,7 +3993,7 @@ dependencies = [ [[package]] name = "rattler_digest" version = "1.0.6" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "blake2", "digest", @@ -4009,7 +4009,7 @@ dependencies = [ [[package]] name = "rattler_index" version = "0.20.12" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "fs-err", "rattler_conda_types", @@ -4024,7 +4024,7 @@ dependencies = [ [[package]] name = "rattler_macros" version = "1.0.6" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "quote", "syn", @@ -4033,7 +4033,7 @@ dependencies = [ [[package]] name = "rattler_networking" version = "0.22.4" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "anyhow", "async-trait", @@ -4062,7 +4062,7 @@ dependencies = [ [[package]] name = "rattler_package_streaming" version = "0.22.28" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "bzip2 0.5.1", "chrono", @@ -4091,7 +4091,7 @@ dependencies = [ [[package]] name = "rattler_redaction" version = "0.1.6" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "reqwest", "reqwest-middleware", @@ -4101,7 +4101,7 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" version = "0.21.37" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "anyhow", "async-compression", @@ -4156,7 +4156,7 @@ dependencies = [ [[package]] name = "rattler_sandbox" version = "0.1.3" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "birdcage", "clap", @@ -4167,7 +4167,7 @@ dependencies = [ [[package]] name = "rattler_shell" version = "0.22.19" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "enum_dispatch", "fs-err", @@ -4185,7 +4185,7 @@ dependencies = [ [[package]] name = "rattler_solve" version = "1.3.8" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "chrono", "futures", @@ -4204,7 +4204,7 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" version = "2.0.3" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "archspec", "libloading", @@ -5022,7 +5022,7 @@ dependencies = [ [[package]] name = "simple_spawn_blocking" version = "1.0.0" -source = "git+https://github.com/nichmor/rattler?branch=misc%2Frun-exports-handle-file-path#c1eb3dd993ac365cd58eb63b719a936b1b2cc4c3" +source = "git+https://github.com/conda/rattler?branch=main#e5341672503cae5e18ac058360e95fa1d0ae7012" dependencies = [ "tokio", ] diff --git a/py-rattler-build/Cargo.toml b/py-rattler-build/Cargo.toml index 81ce7da1c..67ba0ae43 100644 --- a/py-rattler-build/Cargo.toml +++ b/py-rattler-build/Cargo.toml @@ -37,19 +37,19 @@ pyo3-build-config = "0.23.4" [patch.crates-io] zip = { git = "https://github.com/wolfv/zip2", branch = "patched" } -rattler = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_sandbox = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_cache = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_conda_types = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_digest = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_index = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_networking = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_repodata_gateway = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_shell = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_solve = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_redaction = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_virtual_packages = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } -rattler_package_streaming = { git = "https://github.com/nichmor/rattler", branch = "misc/run-exports-handle-file-path" } +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" } # Prevent package from thinking it's in the workspace From b8d28ddfab51af3f0ee7b166affbb43ebee17e98 Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Fri, 28 Feb 2025 08:24:18 +0100 Subject: [PATCH 5/5] undo changes to Cargo.toml --- py-rattler-build/Cargo.toml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/py-rattler-build/Cargo.toml b/py-rattler-build/Cargo.toml index 4ca9d6edb..bfa9294cc 100644 --- a/py-rattler-build/Cargo.toml +++ b/py-rattler-build/Cargo.toml @@ -37,20 +37,6 @@ pyo3-build-config = "0.23.5" [patch.crates-io] zip = { git = "https://github.com/wolfv/zip2", branch = "patched" } -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" } - # Prevent package from thinking it's in the workspace [workspace]