Skip to content
Merged
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
28 changes: 28 additions & 0 deletions src/backend/conda.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ impl<'a> CondaOptions<'a> {
Channel::from_str(&name, &config)
.map_err(|e| eyre::eyre!("invalid conda channel '{}': {}", name, e))
}

fn lockfile_options(&self) -> BTreeMap<String, String> {
BTreeMap::from([("channel".to_string(), self.channel_name())])
}
}

impl CondaBackend {
Expand Down Expand Up @@ -653,6 +657,15 @@ impl Backend for CondaBackend {
&["channel"]
}

fn resolve_lockfile_options(
&self,
request: &crate::toolset::ToolRequest,
_target: &PlatformTarget,
) -> BTreeMap<String, String> {
let raw_opts = request.options();
CondaOptions::new(&raw_opts).lockfile_options()
}

async fn _list_remote_versions(&self, config: &Arc<Config>) -> Result<Vec<VersionInfo>> {
let raw_opts = config.get_tool_opts_with_overrides(&self.ba).await?;
let opts = CondaOptions::new(&raw_opts);
Expand Down Expand Up @@ -831,6 +844,7 @@ mod tests {
use rattler_conda_types::{
PackageName, PackageRecord, RepoDataRecord, Version, package::DistArchiveIdentifier,
};
use std::collections::BTreeMap;
use std::str::FromStr;
use url::Url;

Expand Down Expand Up @@ -868,6 +882,20 @@ mod tests {
assert_eq!(CondaOptions::new(&opts).channel_name(), "conda-forge");
}

#[test]
fn conda_lockfile_options_include_channel() {
let mut opts = ToolVersionOptions::default();
opts.opts.insert(
"channel".to_string(),
toml::Value::String("bioconda".to_string()),
);

assert_eq!(
CondaOptions::new(&opts).lockfile_options(),
BTreeMap::from([("channel".to_string(), "bioconda".to_string())])
);
}

#[test]
fn temp_download_path_is_unique_per_call() {
let tmpdir = tempfile::tempdir().unwrap();
Expand Down
Loading