pin in the napari env too

napari · Sep 30, 2024 · 564d043 · 564d043
1 parent 092428f
commit 564d043
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/make_bundle_conda.yml b/.github/workflows/make_bundle_conda.yml
@@ -550,8 +550,8 @@ jobs:
           conda info
           conda config --show-sources
           conda config --show
-          conda list -p "${{ runner.temp }}/napari-${{ env.version }}/envs/napari-${{ env.version }}"
           conda list -p "${{ runner.temp }}/napari-${{ env.version }}"
+          conda list -p "${{ runner.temp }}/napari-${{ env.version }}/envs/napari-${{ env.version }}"
           xvfb-run --auto-servernum napari --info
           # Test shortcut
           python -c "import pathlib as p; assert list(p.Path('~/.local/share/applications/').expanduser().glob('napari*.desktop'))"

diff --git a/build_installers.py b/build_installers.py
@@ -99,6 +99,13 @@
 else:
     raise RuntimeError(f"Unrecognized OS: {sys.platform}")
 
+CONDA_TOOL_DEPS = (
+    "conda >=23.10",
+    "conda-libmamba-solver",
+    "mamba <2.0a0",
+    "pip",
+)
+
 
 def _use_local():
     """
@@ -215,10 +222,7 @@ def _base_env(python_version=PY_VER):
         ],
         "specs": [
             f"python={python_version}.*=*_cpython",
-            "conda >=23.10",
-            "conda-libmamba-solver",
-            "mamba <2.0a0",
-            "pip",
+            *CONDA_TOOL_DEPS,
         ],
     }
 
@@ -238,11 +242,9 @@ def _napari_env(
             f"napari-menu={napari_version}",
             "napari-plugin-manager",
             f"pyside2={pyside_version}",
-            "conda",
-            "mamba",
-            "pip",
+            *CONDA_TOOL_DEPS,
+            *(extra_specs or ()),
         ]
-        + (extra_specs or []),
         # "exclude": exclude, # TODO: not supported yet in constructor
     }