Skip to content

Commit

Permalink
Merge pull request #2723 from ReactionMechanismGenerator/miniforge_ac…
Browse files Browse the repository at this point in the history
…tion_test

Deprecate the nomkl mutex metapackage
  • Loading branch information
JacksonBurns authored Oct 15, 2024
2 parents 74ef5e6 + 1b37764 commit 704632d
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,16 @@ jobs:
- name: Checkout RMG-Py
uses: actions/checkout@v4

# Step to create a custom condarc.yml before setting up conda
- name: Create custom conda config file
run: |
RUNNER_CWD=$(pwd)
echo "channels:" > $RUNNER_CWD/condarc.yml
echo " - conda-forge" >> $RUNNER_CWD/condarc.yml
echo " - rmg" >> $RUNNER_CWD/condarc.yml
echo " - cantera" >> $RUNNER_CWD/condarc.yml
echo "show_channel_urls: true" >> $RUNNER_CWD/condarc.yml
# configures the mamba environment manager and builds the environment
- name: Setup Miniforge Python 3.7
uses: conda-incubator/setup-miniconda@v3
Expand All @@ -70,6 +80,7 @@ jobs:
miniforge-variant: Miniforge3
miniforge-version: latest
python-version: 3.7
condarc-file: condarc.yml
activate-environment: rmg_env
use-mamba: true

Expand Down Expand Up @@ -112,6 +123,16 @@ jobs:
- name: Checkout RMG-Py
uses: actions/checkout@v4

# Step to create a custom condarc.yml before setting up conda
- name: Create custom condarc.yml
run: |
RUNNER_CWD=$(pwd)
echo "channels:" > $RUNNER_CWD/condarc.yml
echo " - conda-forge" >> $RUNNER_CWD/condarc.yml
echo " - rmg" >> $RUNNER_CWD/condarc.yml
echo " - cantera" >> $RUNNER_CWD/condarc.yml
echo "show_channel_urls: true" >> $RUNNER_CWD/condarc.yml
# configures the mamba environment manager and builds the environment
- name: Setup Miniforge Python 3.7
uses: conda-incubator/setup-miniconda@v3
Expand All @@ -120,6 +141,7 @@ jobs:
miniforge-variant: Miniforge3
miniforge-version: latest
python-version: 3.7
condarc-file: condarc.yml
activate-environment: rmg_env
use-mamba: true

Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ dependencies:
# Note that _some other_ dep. in this list requires diffeqpy in its recipe
# which will cause it to be downloaded from the rmg conda channel

# conda mutex metapackage
- nomkl
# configure packages to use OpenBLAS instead of Intel MKL
- blas=*=openblas

# additional packages that are required, but not specified here (and why)
# pydqed, pydas, mopac, and likely others require a fortran compiler (specifically gfortran)
Expand Down

0 comments on commit 704632d

Please sign in to comment.