diff --git a/.github/pysb-conda-env.yml b/.github/pysb-conda-env.yml index 609b2016..c2e81313 100644 --- a/.github/pysb-conda-env.yml +++ b/.github/pysb-conda-env.yml @@ -4,6 +4,7 @@ channels: - conda-forge dependencies: - alubbock::bionetgen + - alubbock::nfsim==1.12.1 - alubbock::atomizer - alubbock::kappa - numpy diff --git a/pysb/tests/test_importers.py b/pysb/tests/test_importers.py index e5f5b5c3..ee6fd70c 100644 --- a/pysb/tests/test_importers.py +++ b/pysb/tests/test_importers.py @@ -196,7 +196,8 @@ def test_bngl_import_expected_errors(): expected_errors = {'ANx': errtype['plusminus'], 'CaOscillate_Sat': errtype['ratelawtype'], 'heise': errtype['statelabels'], - 'isingspin_energy': errtype['ratelawmissing'], + # following model's error differs between BNG versions + 'isingspin_energy': f"({errtype['ratelawmissing']})|({errtype['ratelawtype']})", 'test_MM': errtype['ratelawtype'], 'test_sat': errtype['ratelawtype'], }