From 23288cc1b0786ed90a71353a45950ff7802e9e77 Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Thu, 27 Jun 2024 17:05:13 +0200 Subject: [PATCH] .. --- .../workflows/test_benchmark_collection_models.yml | 4 +++- .github/workflows/test_petab_test_suite.yml | 11 ++++++++--- pytest.ini | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_benchmark_collection_models.yml b/.github/workflows/test_benchmark_collection_models.yml index 4c581d8a7a..f327cb4d4f 100644 --- a/.github/workflows/test_benchmark_collection_models.yml +++ b/.github/workflows/test_benchmark_collection_models.yml @@ -52,7 +52,9 @@ jobs: AMICI_PARALLEL_COMPILE="" pip3 install -v --user \ $(ls -t python/sdist/dist/amici-*.tar.gz | head -1)[petab,test,vis] - - run: python3 -m pip install git+https://github.com/dweindl/libpetab-python.git@v1_subpackage_271 + - run: | + python3 -m pip install git+https://github.com/dweindl/libpetab-python.git@v1_subpackage_271 \ + && python3 -m pip install -U sympy # retrieve test models - name: Download and test benchmark collection diff --git a/.github/workflows/test_petab_test_suite.yml b/.github/workflows/test_petab_test_suite.yml index 410c610f81..cedb776018 100644 --- a/.github/workflows/test_petab_test_suite.yml +++ b/.github/workflows/test_petab_test_suite.yml @@ -58,9 +58,7 @@ jobs: - name: Install petab run: | source ./venv/bin/activate \ - && pip3 install wheel pytest shyaml pytest-cov pysb>=1.16 \ - && python3 -m pip install sympy>=1.12.1 \ - && python3 -m pip install git+https://github.com/dweindl/libpetab-python.git@v1_subpackage_271 + && pip3 install wheel pytest shyaml pytest-cov pysb>=1.16 # retrieve test models - name: Download and install PEtab test suite @@ -70,6 +68,13 @@ jobs: && source ./venv/bin/activate \ && cd petab_test_suite && pip3 install -e . + - name: Install petab + run: | + source ./venv/bin/activate \ + && python3 -m pip install git+https://github.com/dweindl/libpetab-python.git@v1_subpackage_271 \ + && python3 -m pip install sympy>=1.12.1 + + - name: Run PEtab-related unit tests run: | source ./venv/bin/activate \ diff --git a/pytest.ini b/pytest.ini index 4f682576a3..9ccc3b143c 100644 --- a/pytest.ini +++ b/pytest.ini @@ -3,7 +3,7 @@ addopts = -vv --strict-markers filterwarnings = - error +# error # amici ignore:Conservation laws for non-constant species in models with RateRules are currently not supported and will be turned off.:UserWarning ignore:Conservation laws for non-constant species in models with Species-AssignmentRules are currently not supported and will be turned off.:UserWarning