Skip to content

Commit c571de9

Browse files
authored
Fix warnings (#475)
* Fix false import warnings when running under pytest * Fix parameter names in warnings
1 parent 44c8062 commit c571de9

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

petab/__init__.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,15 @@ def __getattr__(name):
2626
return importlib.import_module("petab.v1")
2727
if name == "v2":
2828
return importlib.import_module("petab.v2")
29-
if name not in ("__path__", "__all__", "__wrapped__"):
29+
if name not in (
30+
"__path__",
31+
"__all__",
32+
"__wrapped__",
33+
# accessed under pytest
34+
"_pytestfixturefunction",
35+
"__test__",
36+
"__bases__",
37+
):
3038
warn(
3139
f"Accessing `petab.{name}` is deprecated and will be removed in "
3240
f"the next major release. Please use `petab.v1.{name}` instead.",

petab/v2/petab1to2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ def update_prior(row):
494494
if new_prior_type == "log10-normal":
495495
warnings.warn(
496496
f"Prior distribution `{new_prior_type}' for parameter "
497-
f"`{row.name}' is not supported in PEtab v2. "
497+
f"`{row[v1.C.PARAMETER_ID]}' is not supported in PEtab v2. "
498498
"Using `log-normal` instead.",
499499
# call to `petab1to2`
500500
stacklevel=9,
@@ -504,7 +504,7 @@ def update_prior(row):
504504
if new_prior_type not in v2.C.PRIOR_DISTRIBUTIONS:
505505
raise NotImplementedError(
506506
f"PEtab v2 does not support prior type `{new_prior_type}' "
507-
f"required for parameter `{row.name}'."
507+
f"required for parameter `{row[v1.C.PARAMETER_ID]}'."
508508
)
509509

510510
return new_prior_type

0 commit comments

Comments
 (0)