Skip to content

Commit f23950c

Browse files
authored
Merge pull request #1590 from HEXRD/libmamba-solver
Use the libmamba solver for packaging
2 parents 9e920a6 + 08056ed commit f23950c

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

.github/workflows/package.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ jobs:
7676
run: |
7777
conda activate hexrdgui-package
7878
mkdir output
79+
80+
# Use libmamba as the solver for all future conda commands
81+
export CONDA_SOLVER=libmamba
82+
7983
HEXRD_PACKAGE_CHANNEL=${HEXRD_PACKAGE_CHANNEL} HEXRDGUI_OUTPUT_FOLDER=output/ cpack
8084
# This is need to ensure ~/.profile or ~/.bashrc are used so the activate
8185
# command works.

packaging/environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ dependencies:
1010
- conda-build
1111
- conda-pack
1212
- click
13+
- conda-libmamba-solver

packaging/package.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ def build_conda_pack(base_path, tmp, hexrd_package_channel, hexrdgui_output_fold
128128
config.variant['hexrd_version'] = hexrd_version
129129

130130
config.CONDA_PY = '38'
131+
config.CONDA_SOLVER = 'libmamba'
131132
logger.info('Building hexrdgui conda package.')
132133
CondaBuild.build(recipe_path, config=config)
133134

@@ -155,6 +156,7 @@ def build_conda_pack(base_path, tmp, hexrd_package_channel, hexrdgui_output_fold
155156
params = [
156157
Conda.Commands.INSTALL,
157158
'--prefix', env_prefix,
159+
'--solver', 'libmamba',
158160
'--override-channels',
159161
'--channel', hexrdgui_output_folder_uri,
160162
'--channel', hexrd_package_channel,

0 commit comments

Comments
 (0)