Skip to content

Commit ba2107c

Browse files
committed
Fix version selection
Previously, the simulator version argument was ignored and always the latest amici version was installed.
1 parent abd1120 commit ba2107c

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,18 @@ jobs:
7575
with:
7676
python-version: '3.11'
7777

78-
- name: Setup pip cache
79-
uses: actions/cache@v3
80-
with:
81-
path: /opt/hostedtoolcache/Python
82-
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements.optional.txt') }}
83-
restore-keys: |
84-
${{ runner.os }}-pip-
78+
# - name: Setup pip cache
79+
# uses: actions/cache@v3
80+
# with:
81+
# path: /opt/hostedtoolcache/Python
82+
# key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements.optional.txt') }}
83+
# restore-keys: |
84+
# ${{ runner.os }}-pip-
8585

8686
- name: Install pip and setuptools
8787
run: |
88-
python -m pip install --upgrade pip==23.0.0
89-
python -m pip install --upgrade pip==23.0.0
88+
python -m pip install --upgrade setuptools
89+
python -m pip install --upgrade pip
9090
9191
- name: Install system dependencies
9292
run: |
@@ -98,7 +98,10 @@ jobs:
9898
9999
# install package
100100
- name: Install the package
101-
run: python -m pip install .[all]
101+
run: |
102+
simulatorVersion=$(jq -r '.version' biosimulators.json)
103+
python -m pip install amici==$simulatorVersion
104+
python -m pip install .[all]
102105
103106
#############################################
104107
## Lint

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,9 @@ RUN apt-get update -y \
4747
# Copy code for command-line interface into image and install it
4848
COPY . /root/Biosimulators_AMICI
4949
RUN pip install pip==23.0.1
50-
RUN pip install sympy /root/Biosimulators_AMICI \
50+
RUN pip install /root/Biosimulators_AMICI \
5151
&& rm -rf /root/Biosimulators_AMICI
52-
#RUN pip install sympy /root/Biosimulators_AMICI amici==${SIMULATOR_VERSION} \
53-
# && rm -rf /root/Biosimulators_AMICI
52+
RUN pip install amici==${SIMULATOR_VERSION}
5453
ENV VERBOSE=0 \
5554
MPLBACKEND=PDF
5655

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
amici >= 0.11.17
21
biosimulators_utils[logging] >= 0.1.180
32
kisao >= 2.33
43
lxml

0 commit comments

Comments
 (0)