Skip to content

Commit 4437967

Browse files
committed
update environment file, CI, Dockerfile to install optional Julia deps
1 parent 6288e78 commit 4437967

4 files changed

Lines changed: 28 additions & 14 deletions

File tree

.github/workflows/CI.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,12 @@ jobs:
122122
activate-environment: rmg_env
123123
use-mamba: true
124124

125+
# installs the extra RMS conda dependencies
126+
- name: Add RMS dependencies
127+
run: |
128+
conda install -c conda-forge julia=1.9.1 pyjulia>=0.6
129+
conda install -c rmg pyrms diffeqpy
130+
125131
# list the environment for debugging purposes
126132
- name: mamba info
127133
run: |

.github/workflows/docs.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ jobs:
3636
activate-environment: rmg_env
3737
use-mamba: true
3838

39+
# installs the extra RMS conda dependencies
40+
- name: Add RMS dependencies
41+
run: |
42+
conda install -c conda-forge julia=1.9.1 pyjulia>=0.6
43+
conda install -c rmg pyrms diffeqpy
44+
3945
- name: Install sphinx
4046
run: mamba install -y sphinx
4147

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ RUN git clone --single-branch --branch main --depth 1 https://github.com/Reactio
4545
WORKDIR /rmg/RMG-Py
4646
# build the conda environment
4747
RUN conda env create --file environment.yml && \
48+
conda install -c conda-forge julia=1.9.1 pyjulia>=0.6 && \
49+
conda install -c rmg pyrms diffeqpy && \
4850
conda clean --all --yes
4951

5052
# This runs all subsequent commands inside the rmg_env conda environment

environment.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# made dependency list more explicit (@JacksonBurns).
1717
# - October 16, 2023 Switched RDKit and descripatastorus to conda-forge,
1818
# moved diffeqpy to pip and (temporarily) removed chemprop
19+
# - Mar 11, 2024 Removed Julia dependencies, now considered optional
1920
#
2021
name: rmg_env
2122
channels:
@@ -48,10 +49,6 @@ dependencies:
4849
- conda-forge::openbabel >= 3
4950
- conda-forge::rdkit >=2022.09.1
5051

51-
# general-purpose external software tools
52-
- conda-forge::julia=1.9.1
53-
- conda-forge::pyjulia >=0.6
54-
5552
# Python tools
5653
- python >=3.7
5754
- coverage
@@ -88,21 +85,24 @@ dependencies:
8885
- rmg::pydas >=1.0.3
8986
- rmg::pydqed >=1.0.3
9087
- rmg::pyrdl
91-
- rmg::pyrms
9288
- rmg::symmetry
9389

94-
# packages we would like to stop maintaining (and why)
95-
- rmg::diffeqpy
96-
# we should use the official verison https://github.com/SciML/diffeqpy),
97-
# rather than ours (which is only made so that we can get it from conda)
98-
# It is only on pip, so we will need to do something like:
99-
# https://stackoverflow.com/a/35245610
100-
# Note that _some other_ dep. in this list requires diffeqpy in its recipe
101-
# which will cause it to be downloaded from the rmg conda channel
102-
10390
# conda mutex metapackage
10491
- nomkl
10592

93+
# optional dependencies for using ReactionMechanismSimulator
94+
# remove the leading '#' to install the required dependencies
95+
# - conda-forge::julia=1.9.1
96+
# - conda-forge::pyjulia >=0.6
97+
# - rmg::pyrms
98+
# - rmg::diffeqpy
99+
100+
# Note about diffeqpy:
101+
# we should use the official verison https://github.com/SciML/diffeqpy),
102+
# rather than ours (which is only made so that we can get it from conda)
103+
# It is only on pip, so we will need to do something like:
104+
# https://stackoverflow.com/a/35245610
105+
106106
# additional packages that are required, but not specified here (and why)
107107
# pydqed, pydas, mopac, and likely others require a fortran compiler (specifically gfortran)
108108
# in the environment. Normally we would add this to the environment file with

0 commit comments

Comments
 (0)