Skip to content

Commit 9076a31

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

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ jobs:
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: |
@@ -99,8 +99,9 @@ jobs:
9999
# install package
100100
- name: Install the package
101101
run: |
102+
simulatorVersion=$(jq -r '.version' biosimulators.json)
102103
python -m pip install .[all]
103-
AMICI_PARALLEL_COMPILE="" python -m pip install amici
104+
AMICI_PARALLEL_COMPILE="" python -m pip install amici==$simulatorVersion
104105
105106
#############################################
106107
## Lint
@@ -172,6 +173,8 @@ jobs:
172173
env:
173174
AMICI_PARALLEL_COMPILE: ""
174175
run: python -m pytest tests/ --cov=./biosimulators_amici/ --cov-report=xml
176+
env:
177+
AMICI_PARALLEL_COMPILE: ""
175178

176179
- name: Upload the coverage report to Codecov
177180
uses: codecov/codecov-action@v5

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM python:3.11-slim-bookworm
33

44
ARG VERSION="0.1.22"
5-
ARG SIMULATOR_VERSION="0.24.0"
5+
ARG SIMULATOR_VERSION="0.34.2"
66

77
# metadata
88
LABEL \
@@ -47,11 +47,10 @@ RUN apt-get update -y \
4747

4848
# Copy code for command-line interface into image and install it
4949
COPY . /root/Biosimulators_AMICI
50-
RUN pip install pip==23.0.1
50+
RUN python -m pip install -U setuptools pip
5151
RUN SETUPTOOLS_SCM_PRETEND_VERSION_FOR_BIOSIMULATORS_AMICI=${VERSION} pip install /root/Biosimulators_AMICI \
5252
&& rm -rf /root/Biosimulators_AMICI
53-
#RUN pip install sympy /root/Biosimulators_AMICI amici==${SIMULATOR_VERSION} \
54-
# && rm -rf /root/Biosimulators_AMICI
53+
RUN AMICI_PARALLEL_COMPILE="" python -m pip install amici==${SIMULATOR_VERSION}
5554
ENV VERBOSE=0 \
5655
MPLBACKEND=PDF \
5756
AMICI_PARALLEL_COMPILE=""

biosimulators.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "amici",
33
"name": "AMICI",
4-
"version": "0.24.0",
4+
"version": "0.34.0",
55
"description": "AMICI provides an interface for the SUNDIALS solvers CVODES (for ordinary differential equations) and IDAS (for algebraic differential equations).",
66
"urls": [
77
{
@@ -10,7 +10,7 @@
1010
}
1111
],
1212
"image": {
13-
"url": "ghcr.io/biosimulators/biosimulators_amici/amici:0.24.0",
13+
"url": "ghcr.io/biosimulators/biosimulators_amici/amici:0.34.0",
1414
"format": {
1515
"namespace": "EDAM",
1616
"id": "format_3973",

0 commit comments

Comments
 (0)