Skip to content

fix: honor workspace [cache.*] overrides for conda-pypi mapping cache #6284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
baszalmstra wants to merge 3 commits into
base: main
Choose a base branch
from
+205 −73
Open

fix: honor workspace [cache.*] overrides for conda-pypi mapping cache #6284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8ffc32
Respect workspace-level [cache.pypi-mapping] and remove global-only c…
claude Jun 4, 2026
28f1067
Add Config::detached_environments_dir convenience method
claude Jun 4, 2026
1ee97ed
Remove now-unused pixi_config dependency from pypi_mapping
claude Jun 4, 2026
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
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

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

99 changes: 88 additions & 11 deletions crates/pixi/tests/integration_rust/solve_group_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,14 @@ async fn test_purl_are_missing_for_non_conda_forge() {
channel: Some("dummy-channel".to_owned()),
};

let mapping_client = pypi_mapping::MappingClient::builder(client.clone()).finish();
let mapping_client = pypi_mapping::MappingClient::builder(
client.clone(),
project
.config()
.cache_dir_for(pixi_config::CacheKind::PypiMapping)
.unwrap(),
)
.finish();
mapping_client
.amend_purls(&MappingSource::Prefix, vec![&mut repo_data_record], None)
.await
Expand Down Expand Up @@ -329,7 +336,14 @@ async fn test_purl_are_generated_using_custom_mapping() {
MappingLocation::Memory(compressed_mapping),
)]);

let mapping_client = pypi_mapping::MappingClient::builder(client.clone()).finish();
let mapping_client = pypi_mapping::MappingClient::builder(
client.clone(),
project
.config()
.cache_dir_for(pixi_config::CacheKind::PypiMapping)
.unwrap(),
)
.finish();
mapping_client
.amend_purls(
&MappingSource::Custom(Arc::new(CustomMapping::new(source))),
Expand Down Expand Up @@ -371,7 +385,14 @@ async fn test_compressed_mapping_catch_not_pandoc_not_a_python_package() {

let packages = vec![&mut repo_data_record];

let mapping_client = pypi_mapping::MappingClient::builder(client.clone()).finish();
let mapping_client = pypi_mapping::MappingClient::builder(
client.clone(),
project
.config()
.cache_dir_for(pixi_config::CacheKind::PypiMapping)
.unwrap(),
)
.finish();
mapping_client
.amend_purls(&MappingSource::Prefix, packages, None)
.await
Expand Down Expand Up @@ -417,7 +438,14 @@ async fn test_dont_record_not_present_package_as_purl() {
channel: Some("https://conda.anaconda.org/conda-forge/".to_owned()),
};

let mapping_client = pypi_mapping::MappingClient::builder(client.clone()).finish();
let mapping_client = pypi_mapping::MappingClient::builder(
client.clone(),
project
.config()
.cache_dir_for(pixi_config::CacheKind::PypiMapping)
.unwrap(),
)
.finish();
mapping_client
.amend_purls(
project.pypi_name_mapping_source().unwrap(),
Expand Down Expand Up @@ -530,7 +558,14 @@ async fn test_we_record_not_present_package_as_purl_for_custom_mapping() {

let mut packages = vec![repo_data_record, boltons_repo_data_record];

let mapping_client = pypi_mapping::MappingClient::builder(client.clone()).finish();
let mapping_client = pypi_mapping::MappingClient::builder(
client.clone(),
project
.config()
.cache_dir_for(pixi_config::CacheKind::PypiMapping)
.unwrap(),
)
.finish();
mapping_client
.amend_purls(
project.pypi_name_mapping_source().unwrap(),
Expand Down Expand Up @@ -602,7 +637,14 @@ async fn test_custom_mapping_channel_with_suffix() {

let mut packages = vec![repo_data_record];

let mapping_client = pypi_mapping::MappingClient::builder(client.clone()).finish();
let mapping_client = pypi_mapping::MappingClient::builder(
client.clone(),
project
.config()
.cache_dir_for(pixi_config::CacheKind::PypiMapping)
.unwrap(),
)
.finish();
mapping_client
.amend_purls(
project.pypi_name_mapping_source().unwrap(),
Expand Down Expand Up @@ -659,7 +701,14 @@ async fn test_repo_data_record_channel_with_suffix() {

let mut packages = vec![repo_data_record];

let mapping_client = pypi_mapping::MappingClient::builder(client.clone()).finish();
let mapping_client = pypi_mapping::MappingClient::builder(
client.clone(),
project
.config()
.cache_dir_for(pixi_config::CacheKind::PypiMapping)
.unwrap(),
)
.finish();
mapping_client
.amend_purls(
project.pypi_name_mapping_source().unwrap(),
Expand Down Expand Up @@ -715,7 +764,14 @@ async fn test_path_channel() {

let mut packages = vec![repo_data_record];

let mapping_client = pypi_mapping::MappingClient::builder(client.clone()).finish();
let mapping_client = pypi_mapping::MappingClient::builder(
client.clone(),
project
.config()
.cache_dir_for(pixi_config::CacheKind::PypiMapping)
.unwrap(),
)
.finish();
mapping_client
.amend_purls(
project.pypi_name_mapping_source().unwrap(),
Expand Down Expand Up @@ -793,7 +849,14 @@ async fn test_file_url_as_mapping_location() {

let mut packages = vec![repo_data_record];

let mapping_client = pypi_mapping::MappingClient::builder(client.clone()).finish();
let mapping_client = pypi_mapping::MappingClient::builder(
client.clone(),
project
.config()
.cache_dir_for(pixi_config::CacheKind::PypiMapping)
.unwrap(),
)
.finish();
mapping_client
.amend_purls(
project.pypi_name_mapping_source().unwrap(),
Expand Down Expand Up @@ -855,7 +918,14 @@ async fn test_disabled_mapping() {

let mut packages = vec![boltons_repo_data_record];

let mapping_client = pypi_mapping::MappingClient::builder(blocked_client.into()).finish();
let mapping_client = pypi_mapping::MappingClient::builder(
blocked_client.into(),
project
.config()
.cache_dir_for(pixi_config::CacheKind::PypiMapping)
.unwrap(),
)
.finish();
mapping_client
.amend_purls(
project.pypi_name_mapping_source().unwrap(),
Expand Down Expand Up @@ -1192,7 +1262,14 @@ async fn test_missing_mapping_file_error_includes_path() {
channel: Some("https://conda.anaconda.org/conda-forge/".to_owned()),
};

let mapping_client = pypi_mapping::MappingClient::builder(client.clone()).finish();
let mapping_client = pypi_mapping::MappingClient::builder(
client.clone(),
project
.config()
.cache_dir_for(pixi_config::CacheKind::PypiMapping)
.unwrap(),
)
.finish();
let result = mapping_client
.amend_purls(
&MappingSource::Custom(Arc::new(CustomMapping::new(source))),
Expand Down
2 changes: 1 addition & 1 deletion crates/pixi_api/src/workspace/reinstall/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ pub async fn reinstall<I: Interface>(

// Message what's installed
let detached_envs_message =
if let Ok(Some(path)) = workspace.config().detached_environments().path() {
if let Ok(Some(path)) = workspace.config().detached_environments_dir() {
format!(" in '{}'", console::style(path.display()).bold())
} else {
"".to_string()
Expand Down
49 changes: 28 additions & 21 deletions crates/pixi_cli/src/clean.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use pixi_command_dispatcher::{
use pixi_consts::consts;
use pixi_core::Workspace;
use pixi_core::WorkspaceLocator;
use pixi_core::WorkspaceLocatorError;
use pixi_core::workspace::WorkspaceRegistry;
use pixi_manifest::EnvironmentName;
use pixi_path::AbsPathBuf;
Expand Down Expand Up @@ -107,8 +108,26 @@ pub struct CacheArgs {
}

pub async fn execute(args: Args) -> miette::Result<()> {
if let Some(Command::Cache(args)) = args.command {
clean_cache(args).await?;
if let Some(Command::Cache(cache_args)) = args.command {
// Resolve the cache config from the workspace when one is available so
// workspace-level `[cache.*]` overrides are honored, falling back to
// the global (system + user) config when run outside a workspace.
let config = match WorkspaceLocator::for_cli()
.with_global_config_source(args.config_source.source())
.with_closest_package(false)
.with_search_start(args.workspace_config.workspace_locator_start())
.locate()
{
Ok(workspace) => workspace.config().clone(),
Err(
WorkspaceLocatorError::WorkspaceNotFound(_)
| WorkspaceLocatorError::MissingWorkspace(_)
| WorkspaceLocatorError::MissingWorkspacePath { .. }
| WorkspaceLocatorError::MissingRegistry(),
) => pixi_config::Config::load_global(),
Err(err) => return Err(err.into()),
};
clean_cache(cache_args, &config).await?;
return Ok(());
}

Expand Down Expand Up @@ -191,34 +210,24 @@ pub async fn execute(args: Args) -> miette::Result<()> {
}

/// Clean the pixi cache folders.
async fn clean_cache(args: CacheArgs) -> miette::Result<()> {
async fn clean_cache(args: CacheArgs, config: &pixi_config::Config) -> miette::Result<()> {
let cache_dir = pixi_config::get_cache_dir()?;
let mut dirs = vec![];

if args.pypi {
dirs.push(pixi_config::cache_dir_for(
pixi_config::CacheKind::PypiWheels,
)?);
dirs.push(config.cache_dir_for(pixi_config::CacheKind::PypiWheels)?);
}
if args.conda {
dirs.push(pixi_config::cache_dir_for(
pixi_config::CacheKind::CondaPackages,
)?);
dirs.push(config.cache_dir_for(pixi_config::CacheKind::CondaPackages)?);
}
if args.repodata {
dirs.push(pixi_config::cache_dir_for(
pixi_config::CacheKind::Repodata,
)?);
dirs.push(config.cache_dir_for(pixi_config::CacheKind::Repodata)?);
}
if args.mapping {
dirs.push(pixi_config::cache_dir_for(
pixi_config::CacheKind::PypiMapping,
)?);
dirs.push(config.cache_dir_for(pixi_config::CacheKind::PypiMapping)?);
}
if args.exec {
dirs.push(pixi_config::cache_dir_for(
pixi_config::CacheKind::ExecEnvironments,
)?);
dirs.push(config.cache_dir_for(pixi_config::CacheKind::ExecEnvironments)?);
}
if args.build_backends {
let cache_dirs = CacheDirs::new(
Expand All @@ -227,9 +236,7 @@ async fn clean_cache(args: CacheArgs) -> miette::Result<()> {
.into_assume_dir(),
);
dirs.push(cache_dirs.resolve_from_env::<BuildBackendsDir>().into());
dirs.push(pixi_config::cache_dir_for(
pixi_config::CacheKind::BuildToolEnvironments,
)?);
dirs.push(config.cache_dir_for(pixi_config::CacheKind::BuildToolEnvironments)?);
// TODO: Let's clean deprecated cache directory.
// This will be removed in a future release.
dirs.push(cache_dir.join(consts::_CACHED_BUILD_ENVS_DIR));
Expand Down
2 changes: 1 addition & 1 deletion crates/pixi_cli/src/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ pub async fn execute(args: Args) -> miette::Result<()> {
.expect("failed to write into message buffer");
}

if let Ok(Some(path)) = workspace.config().detached_environments().path() {
if let Ok(Some(path)) = workspace.config().detached_environments_dir() {
write!(
&mut message,
" in '{}'",
Expand Down
Loading
Loading