Skip to content

Commit 04551b5

Browse files
update deprecated functions in tests
1 parent feaf0d3 commit 04551b5

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

petab/problem.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ def to_files(
411411
visualization tables, they will be merged and written to a single file.
412412
413413
Arguments:
414-
sbml_file: SBML model destination
414+
sbml_file: SBML model destination (deprecated)
415415
model_file: Model destination
416416
condition_file: Condition table destination
417417
measurement_file: Measurement table destination

tests/test_parameter_mapping.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,8 @@ def test_partial_override(condition_df_2_conditions):
351351
actual = petab.get_optimization_to_simulation_parameter_mapping(
352352
measurement_df=measurement_df,
353353
condition_df=condition_df,
354-
sbml_model=ss_model.model, parameter_df=parameter_df
354+
model=petab.models.sbml_model.SbmlModel(ss_model.model),
355+
parameter_df=parameter_df
355356
)
356357

357358
# Comparison with NaN containing expected results fails after pickling!
@@ -399,7 +400,7 @@ def test_parameterized_condition_table():
399400
measurement_df=measurement_df,
400401
condition_df=condition_df,
401402
parameter_df=parameter_df,
402-
sbml_model=ss_model.model
403+
model=petab.models.sbml_model.SbmlModel(ss_model.model),
403404
)
404405

405406
expected = [({}, {'dynamicParameter1': 'dynamicOverride1_1'},
@@ -467,7 +468,7 @@ def test_parameterized_condition_table_changed_scale():
467468
measurement_df=measurement_df,
468469
condition_df=condition_df,
469470
parameter_df=parameter_df,
470-
sbml_model=ss_model.model
471+
model=petab.models.sbml_model.SbmlModel(ss_model.model)
471472
)
472473

473474
expected = [
@@ -487,8 +488,8 @@ def test_parameterized_condition_table_changed_scale():
487488
measurement_df=measurement_df,
488489
condition_df=condition_df,
489490
parameter_df=parameter_df,
490-
sbml_model=ss_model.model,
491-
scaled_parameters=True
491+
model=petab.models.sbml_model.SbmlModel(ss_model.model),
492+
scaled_parameters=True,
492493
)
493494

494495
expected = [
@@ -510,7 +511,8 @@ def test_parameterized_condition_table_changed_scale():
510511
measurement_df=measurement_df,
511512
condition_df=condition_df,
512513
parameter_df=parameter_df,
513-
sbml_model=ss_model.model)
514+
model=petab.models.sbml_model.SbmlModel(ss_model.model),
515+
)
514516

515517
expected = [
516518
({overridee_id: 'dynamicOverrideLog10'},

tests/test_petab.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,13 +570,14 @@ def test_to_files(petab_problem): # pylint: disable=W0621
570570

571571
# write contents to files
572572
petab_problem.to_files(
573-
sbml_file=sbml_file,
573+
model_file=sbml_file,
574574
condition_file=condition_file,
575575
measurement_file=measurement_file,
576576
parameter_file=parameter_file,
577577
visualization_file=None,
578578
observable_file=observable_file,
579-
yaml_file=None)
579+
yaml_file=None,
580+
)
580581

581582
# exemplarily load some
582583
parameter_df = petab.get_parameter_df(parameter_file)

tests/test_sbml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def test_get_condition_specific_models():
5252
parameter_df.set_index([petab.PARAMETER_ID], inplace=True)
5353

5454
petab_problem = petab.Problem(
55-
sbml_model=ss_model.model,
55+
model=petab.models.sbml_model.SbmlModel(ss_model.model),
5656
condition_df=condition_df,
5757
observable_df=observable_df,
5858
measurement_df=measurement_df,

0 commit comments

Comments
 (0)