Merge pull request #1590 from HEXRD/libmamba-solver

Use the libmamba solver for packaging
HEXRD · Oct 17, 2023 · f23950c · f23950c
2 parents 9e920a6 + 08056ed
commit f23950c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -76,6 +76,10 @@ jobs:
       run: |
           conda activate hexrdgui-package
           mkdir output
+
+          # Use libmamba as the solver for all future conda commands
+          export CONDA_SOLVER=libmamba
+
           HEXRD_PACKAGE_CHANNEL=${HEXRD_PACKAGE_CHANNEL} HEXRDGUI_OUTPUT_FOLDER=output/ cpack
       # This is need to ensure ~/.profile or ~/.bashrc are used so the activate
       # command works.

diff --git a/packaging/environment.yml b/packaging/environment.yml
@@ -10,3 +10,4 @@ dependencies:
   - conda-build
   - conda-pack
   - click
+  - conda-libmamba-solver
diff --git a/packaging/package.py b/packaging/package.py
@@ -128,6 +128,7 @@ def build_conda_pack(base_path, tmp, hexrd_package_channel, hexrdgui_output_fold
     config.variant['hexrd_version'] = hexrd_version
 
     config.CONDA_PY = '38'
+    config.CONDA_SOLVER = 'libmamba'
     logger.info('Building hexrdgui conda package.')
     CondaBuild.build(recipe_path, config=config)
 
@@ -155,6 +156,7 @@ def build_conda_pack(base_path, tmp, hexrd_package_channel, hexrdgui_output_fold
     params = [
         Conda.Commands.INSTALL,
         '--prefix', env_prefix,
+        '--solver', 'libmamba',
         '--override-channels',
         '--channel', hexrdgui_output_folder_uri,
         '--channel', hexrd_package_channel,