Skip to content

Commit ab9468e

Browse files
committed
update environment file, CI, Dockerfile to install optional Julia deps
1 parent 859dad7 commit ab9468e

4 files changed

Lines changed: 28 additions & 13 deletions

File tree

.github/workflows/CI.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ jobs:
112112
uses: actions/checkout@v3
113113

114114
# configures the mamba environment manager and builds the environment
115-
- name: Patch Environment File
116-
run: sed -i 's/ - conda-forge::julia>=1.8.5,!=1.9.0/ - conda-forge::julia=1.9.1/' environment.yml
117115
- name: Setup Mambaforge Python 3.7
118116
uses: conda-incubator/setup-miniconda@v2
119117
with:
@@ -124,6 +122,12 @@ jobs:
124122
activate-environment: rmg_env
125123
use-mamba: true
126124

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+
127131
# list the environment for debugging purposes
128132
- name: mamba info
129133
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 & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# Changelog:
1515
# - May 15, 2023 Added this changelog, added inline documentation,
1616
# made dependency list more explicit (@JacksonBurns).
17+
# - Mar 11, 2024 Removed Julia dependencies, now considered optional
1718
#
1819
name: rmg_env
1920
channels:
@@ -45,10 +46,6 @@ dependencies:
4546
- conda-forge::cclib >=1.6.3,!=1.8.0
4647
- conda-forge::openbabel >= 3
4748

48-
# general-purpose external software tools
49-
- conda-forge::julia=1.9.1
50-
- conda-forge::pyjulia >=0.6
51-
5249
# Python tools
5350
- python >=3.7
5451
- coverage
@@ -85,16 +82,9 @@ dependencies:
8582
- rmg::pydas >=1.0.3
8683
- rmg::pydqed >=1.0.3
8784
- rmg::pyrdl
88-
- rmg::pyrms
8985
- rmg::symmetry
9086

9187
# packages we would like to stop maintaining (and why)
92-
- rmg::diffeqpy
93-
# we should use the official verison https://github.com/SciML/diffeqpy),
94-
# rather than ours (which is only made so that we can get it from conda)
95-
# It is only on pip, so we will need to do something like:
96-
# https://stackoverflow.com/a/35245610
97-
9888
- rmg::chemprop
9989
# Our build of this is version 0.0.1 (!!) and we are using parts
10090
# of the API that are now gone. Need a serious PR to fix this.
@@ -106,6 +96,19 @@ dependencies:
10696
# conda mutex metapackage
10797
- nomkl
10898

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

0 commit comments

Comments
 (0)