Skip to content

Commit 88ebe24

Browse files
authored
Merge pull request #2609 from ReactionMechanismGenerator/julia_restriction
Julia restriction
2 parents ed99c21 + 3774222 commit 88ebe24

4 files changed

Lines changed: 3 additions & 9 deletions

File tree

.github/workflows/CI.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ jobs:
6262
uses: actions/checkout@v3
6363

6464
# configures the mamba environment manager and builds the environment
65-
- name: Patch Environment File
66-
run: sed -i '' 's/ - conda-forge::julia>=1.8.5,!=1.9.0/ - conda-forge::julia=1.9.1/' environment.yml
6765
- name: Setup Mambaforge Python 3.7
6866
uses: conda-incubator/setup-miniconda@v2
6967
with:

.github/workflows/docs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ jobs:
1616
shell: bash -l {0}
1717
steps:
1818
- uses: actions/checkout@v2
19-
- name: Patch Environment File
20-
run: sed -i 's/ - conda-forge::julia>=1.8.5,!=1.9.0/ - conda-forge::julia=1.9.1/' environment.yml
2119
- name: Setup Mambaforge Python 3.7
2220
uses: conda-incubator/setup-miniconda@v2
2321
with:

Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN ln -snf /bin/bash /bin/sh
1313
# - libxrender1 required by RDKit
1414
RUN apt-get update && \
1515
apt-get install -y \
16-
make \
16+
make \
1717
gcc \
1818
wget \
1919
git \
@@ -43,8 +43,6 @@ RUN git clone --single-branch --branch main --depth 1 https://github.com/Reactio
4343
git clone --single-branch --branch main --depth 1 https://github.com/ReactionMechanismGenerator/RMG-database.git
4444

4545
WORKDIR /rmg/RMG-Py
46-
# patch the env file to a specific version of Julia that we know to be working on all platforms
47-
RUN sed -i 's/ - conda-forge::julia>=1.8.5,!=1.9.0/ - conda-forge::julia=1.9.4/' environment.yml
4846
# build the conda environment
4947
RUN conda env create --file environment.yml && \
5048
conda clean --all --yes
@@ -67,7 +65,7 @@ ENV PATH="$RUNNER_CWD/RMG-Py:$PATH"
6765
ENV JULIA_CPU_TARGET="x86-64,haswell,skylake,broadwell,znver1,znver2,znver3,cascadelake,icelake-client,cooperlake,generic"
6866
RUN make && \
6967
julia -e 'using Pkg; Pkg.add(PackageSpec(name="PyCall",rev="master")); Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="main")); using ReactionMechanismSimulator' && \
70-
python -c "import julia; julia.install(); import diffeqpy; diffeqpy.install()"
68+
python -c "import julia; julia.install(); import diffeqpy; diffeqpy.install()"
7169

7270
# RMG-Py should now be installed and ready - trigger precompilation and test run
7371
RUN python-jl rmg.py examples/rmg/minimal/input.py

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies:
4646
- conda-forge::openbabel >= 3
4747

4848
# general-purpose external software tools
49-
- conda-forge::julia>=1.8.5,!=1.9.0
49+
- conda-forge::julia=1.9.1
5050
- conda-forge::pyjulia >=0.6
5151

5252
# Python tools

0 commit comments

Comments
 (0)