diff --git a/.github/workflows/test_petab_test_suite.yml b/.github/workflows/test_petab_test_suite.yml index 8d26af6109..76ecc19f8e 100644 --- a/.github/workflows/test_petab_test_suite.yml +++ b/.github/workflows/test_petab_test_suite.yml @@ -79,7 +79,7 @@ jobs: run: | source ./venv/bin/activate \ && pytest --cov-report=xml:coverage.xml \ - --cov=./ python/tests/test_*petab*.py python/tests/petab/ + --cov=./ python/tests/test_*petab*.py python/tests/petab_/ # run test models - name: Run PEtab test suite diff --git a/pytest.ini b/pytest.ini index 7aee1687bc..9c2da85f82 100644 --- a/pytest.ini +++ b/pytest.ini @@ -3,6 +3,8 @@ addopts = -vv --strict-markers filterwarnings = + # warnings are errors + 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 diff --git a/python/sdist/amici/petab/sbml_import.py b/python/sdist/amici/petab/sbml_import.py index 3a9ca7eaf9..92009bf7cd 100644 --- a/python/sdist/amici/petab/sbml_import.py +++ b/python/sdist/amici/petab/sbml_import.py @@ -90,7 +90,7 @@ def import_model_sbml( :return: The created :class:`amici.sbml_import.SbmlImporter` instance. """ - from petab.models.sbml_model import SbmlModel + from petab.v1.models.sbml_model import SbmlModel set_log_level(logger, verbose) diff --git a/python/tests/petab/test_petab_problem.py b/python/tests/petab_/test_petab_problem.py similarity index 100% rename from python/tests/petab/test_petab_problem.py rename to python/tests/petab_/test_petab_problem.py diff --git a/tests/petab_test_suite/test_petab_suite.py b/tests/petab_test_suite/test_petab_suite.py index fee6c6d763..cf1c7d4266 100755 --- a/tests/petab_test_suite/test_petab_suite.py +++ b/tests/petab_test_suite/test_petab_suite.py @@ -6,7 +6,7 @@ import amici import pandas as pd -import petab +import petab.v1 as petab import petabtests import pytest from _pytest.outcomes import Skipped