Skip to content

Commit c50c598

Browse files
authored
Merge pull request #693 from ReactionMechanismGenerator/fix/failing_ci
Fix failing CI due to Python 3.9 changes
2 parents 17cd80b + 15fec99 commit c50c598

1 file changed

Lines changed: 13 additions & 9 deletions

File tree

.github/workflows/CI.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ jobs:
6464
path: RMG-database
6565

6666
# configures the mamba environment manager and builds the environment
67-
- name: Setup Miniforge Python 3.7
67+
- name: Setup Miniforge Python 3.9
6868
uses: conda-incubator/setup-miniconda@v3
6969
with:
7070
environment-file: RMG-Py/environment.yml
7171
miniforge-variant: Miniforge3
7272
miniforge-version: latest
73-
python-version: 3.7
73+
python-version: 3.9
7474
activate-environment: rmg_env
7575
use-mamba: true
7676

@@ -98,13 +98,17 @@ jobs:
9898
make clean
9999
make
100100
101+
- name: Setup Juliaup
102+
uses: julia-actions/install-juliaup@v2
103+
with:
104+
channel: '1.10'
105+
101106
# RMS installation and linking to Julia
102107
- name: Install and link Julia dependencies
103108
timeout-minutes: 120 # this usually takes 20-45 minutes (or hangs for 6+ hours).
104109
run: |
105-
python -c "import julia; julia.install(); import diffeqpy; diffeqpy.install()"
106-
julia -e 'using Pkg; Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="for_rmg")); using ReactionMechanismSimulator'
107-
110+
. install_rms.sh
111+
108112
- name: Install Q2DTor
109113
run: echo "" | make q2dtor
110114

@@ -119,7 +123,7 @@ jobs:
119123
run: |
120124
for regr_test in aromatics liquid_oxidation nitrogen oxidation sulfur superminimal RMS_constantVIdealGasReactor_superminimal RMS_CSTR_liquid_oxidation RMS_liquidSurface_ch4o2cat;
121125
do
122-
if python-jl rmg.py test/regression/"$regr_test"/input.py; then
126+
if python rmg.py test/regression/"$regr_test"/input.py; then
123127
echo "$regr_test" "Executed Successfully"
124128
else
125129
echo "$regr_test" "Failed to Execute" | tee -a $GITHUB_STEP_SUMMARY
@@ -199,7 +203,7 @@ jobs:
199203
200204
echo "<details>"
201205
# Compare the edge and core
202-
if python-jl scripts/checkModels.py \
206+
if python scripts/checkModels.py \
203207
"$regr_test-core" \
204208
$REFERENCE/"$regr_test"/chemkin/chem_annotated.inp \
205209
$REFERENCE/"$regr_test"/chemkin/species_dictionary.txt \
@@ -216,7 +220,7 @@ jobs:
216220
cat "$regr_test-core.log" || (echo "Dumping the whole log failed, please download it from GitHub actions. Here are the first 100 lines:" && head -n100 "$regr_test-core.log")
217221
echo "</details>"
218222
echo "<details>"
219-
if python-jl scripts/checkModels.py \
223+
if python scripts/checkModels.py \
220224
"$regr_test-edge" \
221225
$REFERENCE/"$regr_test"/chemkin/chem_edge_annotated.inp \
222226
$REFERENCE/"$regr_test"/chemkin/species_edge_dictionary.txt \
@@ -237,7 +241,7 @@ jobs:
237241
if [ -f test/regression/"$regr_test"/regression_input.py ];
238242
then
239243
echo "<details>"
240-
if python-jl rmgpy/tools/regression.py \
244+
if python rmgpy/tools/regression.py \
241245
test/regression/"$regr_test"/regression_input.py \
242246
$REFERENCE/"$regr_test"/chemkin \
243247
test/regression/"$regr_test"/chemkin

0 commit comments

Comments
 (0)