Skip to content

Commit

Permalink
Merge pull request #2609 from ReactionMechanismGenerator/julia_restri…
Browse files Browse the repository at this point in the history
…ction

Julia restriction
  • Loading branch information
JacksonBurns authored Feb 12, 2024
2 parents ed99c21 + 3774222 commit 88ebe24
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ jobs:
uses: actions/checkout@v3

# configures the mamba environment manager and builds the environment
- name: Patch Environment File
run: sed -i '' 's/ - conda-forge::julia>=1.8.5,!=1.9.0/ - conda-forge::julia=1.9.1/' environment.yml
- name: Setup Mambaforge Python 3.7
uses: conda-incubator/setup-miniconda@v2
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ jobs:
shell: bash -l {0}
steps:
- uses: actions/checkout@v2
- name: Patch Environment File
run: sed -i 's/ - conda-forge::julia>=1.8.5,!=1.9.0/ - conda-forge::julia=1.9.1/' environment.yml
- name: Setup Mambaforge Python 3.7
uses: conda-incubator/setup-miniconda@v2
with:
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN ln -snf /bin/bash /bin/sh
# - libxrender1 required by RDKit
RUN apt-get update && \
apt-get install -y \
make \
make \
gcc \
wget \
git \
Expand Down Expand Up @@ -43,8 +43,6 @@ RUN git clone --single-branch --branch main --depth 1 https://github.com/Reactio
git clone --single-branch --branch main --depth 1 https://github.com/ReactionMechanismGenerator/RMG-database.git

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

# RMG-Py should now be installed and ready - trigger precompilation and test run
RUN python-jl rmg.py examples/rmg/minimal/input.py
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies:
- conda-forge::openbabel >= 3

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

# Python tools
Expand Down

0 comments on commit 88ebe24

Please sign in to comment.