Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ rattler_cache = { version = "0.10", default-features = false }
rattler_conda_types = { version = "0.47", default-features = false, features = [
"rayon",
] }
rattler_config = { version = "0.5", default-features = false }
rattler_digest = { version = "1.3", default-features = false }
rattler_index = { version = "0.30", default-features = false, features = [
"s3",
Expand Down
9 changes: 5 additions & 4 deletions crates/pixi_api/src/workspace/init/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::{
use itertools::Itertools;
use miette::{Context, IntoDiagnostic};
use minijinja::{Environment, context};
use pixi_config::{Config, get_default_author, pixi_home};
use pixi_config::{Config, S3OptionsMap, get_default_author, pixi_home};
use pixi_consts::consts;
use pixi_core::{Workspace, workspace::WorkspaceMut};
use pixi_manifest::{
Expand Down Expand Up @@ -57,7 +57,7 @@ pub struct RenderContext {
pub channels: Vec<NamedChannelOrUrl>,
pub index_url: Option<Url>,
pub extra_index_urls: Vec<Url>,
pub s3_options: HashMap<String, pixi_config::S3Options>,
pub s3_options: S3OptionsMap,
pub conda_pypi_mapping: Option<CondaPypiMap>,
}

Expand Down Expand Up @@ -468,7 +468,7 @@ fn render_workspace(
platforms: &Vec<String>,
index_url: Option<&Url>,
extra_index_urls: &Vec<Url>,
s3_options: HashMap<String, pixi_config::S3Options>,
s3_options: S3OptionsMap,
env_vars: Option<&HashMap<String, String>>,
pypi_mapping: Option<&CondaPypiMap>,
) -> String {
Expand Down Expand Up @@ -591,7 +591,7 @@ fn quote_toml_string(value: &str) -> String {
}

fn relevant_s3_options(
s3_options: HashMap<String, pixi_config::S3Options>,
s3_options: S3OptionsMap,
channels: Vec<NamedChannelOrUrl>,
) -> HashMap<String, pixi_config::S3Options> {
// only take s3 options in manifest if they are used in the default channels
Expand All @@ -611,6 +611,7 @@ fn relevant_s3_options(
.collect::<Vec<_>>();

s3_options
.0
.into_iter()
.filter(|(key, _)| s3_buckets.contains(key))
.collect()
Expand Down
2 changes: 2 additions & 0 deletions crates/pixi_config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ clap = { workspace = true, features = ["std", "derive", "env"] }
console = { workspace = true }
dirs = { workspace = true }
fs-err = { workspace = true }
indexmap = { workspace = true }
itertools = { workspace = true }
miette = { workspace = true }
pixi_consts = { workspace = true }
rattler = { workspace = true }
rattler_conda_types = { workspace = true }
rattler_config = { workspace = true }
rattler_networking = { workspace = true, features = ["s3"] }
rattler_repodata_gateway = { workspace = true, features = ["gateway"] }
reqwest = { workspace = true }
Expand Down
Loading
Loading