Skip to content

Commit e524930

Browse files
authored
Merge pull request #2073 from AMICI-dev/release_0.17.0
Release 0.17.0
2 parents 1a99308 + 6dbff4f commit e524930

File tree

155 files changed

+6775
-2947
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+6775
-2947
lines changed

.github/workflows/deploy_branch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Deploy Branch
2-
on: [push, pull_request, workflow_dispatch]
2+
on: [push, merge_group, workflow_dispatch]
33

44
jobs:
55
sdist:
@@ -9,7 +9,7 @@ jobs:
99

1010
strategy:
1111
matrix:
12-
python-version: [3.8]
12+
python-version: [3.9]
1313

1414
steps:
1515
- name: Set up Python ${{ matrix.python-version }}

.github/workflows/deploy_protected.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88
pull_request:
99
paths:
1010
- container/Dockerfile
11+
# ensure all relevant files are still included in sdist
12+
- python/sdist/MANIFEST.in
1113
workflow_dispatch:
1214

1315
jobs:
@@ -19,7 +21,7 @@ jobs:
1921

2022
strategy:
2123
matrix:
22-
python-version: [3.8]
24+
python-version: [3.9]
2325

2426
steps:
2527
- name: Set up Python ${{ matrix.python-version }}

.github/workflows/deploy_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
python-version: [3.8]
15+
python-version: [3.9]
1616

1717
steps:
1818
- name: Set up Python ${{ matrix.python-version }}

.github/workflows/test_benchmark_collection_models.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
branches:
55
- develop
66
- master
7-
87
pull_request:
98
branches:
109
- master
1110
- develop
11+
merge_group:
1212
workflow_dispatch:
1313
schedule:
1414
- cron: '48 4 * * *'
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
python-version: [ "3.8" ]
25+
python-version: [ "3.9" ]
2626
extract_subexpressions: ["true", "false"]
2727
env:
2828
AMICI_EXTRACT_CSE: ${{ matrix.extract_subexpressions }}
@@ -51,15 +51,22 @@ jobs:
5151
pip3 install build && cd python/sdist && python3 -m build --sdist
5252
- name: Install AMICI sdist
5353
run: |
54+
pip3 install --user petab[vis] && \
5455
AMICI_PARALLEL_COMPILE=2 pip3 install -v --user \
55-
$(ls -t python/sdist/dist/amici-*.tar.gz | head -1)[petab,test]
56+
$(ls -t python/sdist/dist/amici-*.tar.gz | head -1)[petab,test,vis]
5657
5758
# retrieve test models
5859
- name: Download and test benchmark collection
5960
run: |
6061
git clone --depth 1 https://github.com/benchmarking-initiative/Benchmark-Models-PEtab.git \
6162
&& export BENCHMARK_COLLECTION="$(pwd)/Benchmark-Models-PEtab/Benchmark-Models/" \
6263
&& AMICI_PARALLEL_COMPILE=2 tests/benchmark-models/test_benchmark_collection.sh
64+
65+
# run gradient checks
66+
- name: Run Gradient Checks
67+
run: |
68+
pip install git+https://github.com/ICB-DCM/fiddy.git \
69+
&& cd tests/benchmark-models && pytest ./test_petab_benchmark.py
6370
6471
# upload results
6572
- uses: actions/upload-artifact@v3

.github/workflows/test_doc.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
branches:
99
- develop
1010
- master
11+
merge_group:
1112
workflow_dispatch:
1213
schedule:
1314
- cron: '48 4 * * *'
@@ -20,7 +21,7 @@ jobs:
2021

2122
strategy:
2223
matrix:
23-
python-version: [3.8]
24+
python-version: [3.9]
2425

2526
steps:
2627
- name: Set up Python ${{ matrix.python-version }}
@@ -55,7 +56,7 @@ jobs:
5556

5657
strategy:
5758
matrix:
58-
python-version: [ 3.8 ]
59+
python-version: [ "3.10" ]
5960

6061
steps:
6162
- name: Set up Python ${{ matrix.python-version }}
@@ -67,7 +68,7 @@ jobs:
6768
- run: git fetch --prune --unshallow
6869

6970
- run: echo "AMICI_DIR=$(pwd)" >> $GITHUB_ENV
70-
- run: echo "SWIG=${AMICI_DIR}/ThirdParty/swig-4.0.2/install/bin/swig" >> $GITHUB_ENV
71+
- run: echo "SWIG=${AMICI_DIR}/ThirdParty/swig-4.1.1/install/bin/swig" >> $GITHUB_ENV
7172

7273
- name: Build doxygen
7374
run: |

.github/workflows/test_install.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Installation
2-
on: [push, pull_request, workflow_dispatch]
2+
on: [push, merge_group, workflow_dispatch]
33

44
jobs:
55
archive:
@@ -9,7 +9,7 @@ jobs:
99

1010
strategy:
1111
matrix:
12-
python-version: [3.8]
12+
python-version: [3.9]
1313

1414
steps:
1515
- name: Set up Python ${{ matrix.python-version }}
@@ -57,7 +57,7 @@ jobs:
5757

5858
strategy:
5959
matrix:
60-
python-version: [3.8]
60+
python-version: [3.9]
6161

6262
steps:
6363
- name: Set up Python ${{ matrix.python-version }}

.github/workflows/test_matlab.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Matlab
2-
on: [push, pull_request, workflow_dispatch]
2+
on: [push, merge_group, workflow_dispatch]
33

44
jobs:
55
matlab:

.github/workflows/test_performance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
strategy:
2525
matrix:
26-
python-version: [3.8]
26+
python-version: [3.9]
2727

2828
steps:
2929
- name: Set up Python ${{ matrix.python-version }}

.github/workflows/test_petab_test_suite.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ on:
44
branches:
55
- develop
66
- master
7-
87
pull_request:
98
branches:
109
- master
1110
- develop
12-
11+
merge_group:
1312
workflow_dispatch:
1413

1514
jobs:
@@ -23,7 +22,7 @@ jobs:
2322

2423
strategy:
2524
matrix:
26-
python-version: [3.8]
25+
python-version: [3.9]
2726

2827
steps:
2928
- name: Set up Python ${{ matrix.python-version }}
@@ -63,7 +62,7 @@ jobs:
6362
# retrieve test models
6463
- name: Download and install PEtab test suite
6564
run: |
66-
git clone --depth 1 --branch develop \
65+
git clone --depth 1 --branch main \
6766
https://github.com/PEtab-dev/petab_test_suite \
6867
&& source ./build/venv/bin/activate \
6968
&& cd petab_test_suite && pip3 install -e .
@@ -76,7 +75,6 @@ jobs:
7675
7776
# run test models
7877
- name: Run PEtab test suite
79-
# git clone --depth 1 https://github.com/petab-dev/petab_test_suite
8078
run: |
8179
source ./build/venv/bin/activate \
8280
&& AMICI_PARALLEL_COMPILE=2 pytest -v \

.github/workflows/test_pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
python-version: [3.8, 3.9, '3.10']
14+
python-version: [3.9, 3.9, '3.10']
1515
os: [ubuntu-22.04, macos-latest]
1616

1717
runs-on: ${{ matrix.os }}

0 commit comments

Comments
 (0)