Merge pull request #361 from xylar/fix-mache-version-in-pixi

Fixes to mache.deploy

Author: xylar

.github/workflows/build_workflow.yml

@@ -119,8 +119,10 @@ jobs:
         include:
           - python-version: "3.10"
             pixi-env: py310
+            workflow-path: workflow_tests/test_deploy_workflow.py
           - python-version: "3.14"
             pixi-env: py314
+            workflow-path: workflow_tests
       fail-fast: false
     steps:
       - id: skip_check
@@ -148,4 +150,4 @@ jobs:
       - if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
         name: Run workflow tests
         run: |
-          pixi run -e ${{ matrix.pixi-env }} pytest workflow_tests
+          pixi run -e ${{ matrix.pixi-env }} pytest ${{ matrix.workflow-path }}

conda/recipe/recipe.yaml

@@ -2,7 +2,7 @@ schema_version: 1
 
 context:
   name: mache
-  version: 3.0.2
+  version: 3.0.3
 
 package:
   name: ${{ name|lower }}

docs/design/mache_deploy.md

@@ -195,13 +195,16 @@ maintainers to do full shared-environment deployments when needed.
     “software” spack env)
 - `deploy.py` exposes CLI flags such as:
   - `--deploy-spack` (force-enable spack deployment)
+  - `--no-spack` (disable all spack use for a single run)
   - `--spack-path <path>` (temporary override for `spack.spack_path`)
 
 **Precedence**
 
-1. If the user passes `--deploy-spack`, spack deployment is enabled regardless
-   of the config default.
-2. Otherwise, fall back to the `config.yaml.j2` default.
+1. If the user passes `--no-spack`, all spack use is disabled for that run.
+2. Otherwise, if the user passes `--deploy-spack`, spack deployment is enabled
+   regardless of the config default.
+3. Otherwise, fall back to the `config.yaml.j2` default for deployment and
+   reuse any supported pre-existing spack environments in load scripts.
 
 For spack checkout path resolution:
 

docs/users_guide/deploy.md

@@ -174,7 +174,8 @@ Important settings:
 - `pixi.prefix`: required in practice.
 - `pixi.channels`: required and must be non-empty.
 - `spack.spack_path`: required when Spack support is enabled and no hook or
-  CLI override provides it.
+  CLI override provides it, unless the user disables Spack for that run with
+  `--no-spack`.
 - `jigsaw.enabled`: optional.
 - `hooks`: optional and disabled unless explicitly configured.
 
@@ -492,13 +493,16 @@ Fix:
 
 Cause:
 
-- Spack support was enabled but no path was provided in config, hooks, or the
-  CLI.
+- Spack support was enabled for this run, but no path was provided in config,
+  hooks, or the CLI.
 
 Fix:
 
 - Set `spack.spack_path`, write it in a hook through
   `ctx.runtime["spack"]["spack_path"]`, or pass `--spack-path`.
+- If this should be a Pixi-only run, pass `--no-spack`.
+- A `pre_spack` hook may also disable Spack for one run by returning
+  `{"spack": {"supported": false, "software": {"supported": false}}}`.
 
 ### `project.version` is still `dynamic`
 
@@ -521,4 +525,4 @@ Cause:
 
 Fix:
 
-- Use `source load_<software>*.sh` from `bash`.
+- Use `source load_<software>*.sh` from `bash`.