diff --git a/petab/__init__.py b/petab/__init__.py index 348f1269..23b376c2 100644 --- a/petab/__init__.py +++ b/petab/__init__.py @@ -26,7 +26,15 @@ def __getattr__(name): return importlib.import_module("petab.v1") if name == "v2": return importlib.import_module("petab.v2") - if name not in ("__path__", "__all__", "__wrapped__"): + if name not in ( + "__path__", + "__all__", + "__wrapped__", + # accessed under pytest + "_pytestfixturefunction", + "__test__", + "__bases__", + ): warn( f"Accessing `petab.{name}` is deprecated and will be removed in " f"the next major release. Please use `petab.v1.{name}` instead.", diff --git a/petab/v2/petab1to2.py b/petab/v2/petab1to2.py index e3bd4f2d..a5101a2e 100644 --- a/petab/v2/petab1to2.py +++ b/petab/v2/petab1to2.py @@ -494,7 +494,7 @@ def update_prior(row): if new_prior_type == "log10-normal": warnings.warn( f"Prior distribution `{new_prior_type}' for parameter " - f"`{row.name}' is not supported in PEtab v2. " + f"`{row[v1.C.PARAMETER_ID]}' is not supported in PEtab v2. " "Using `log-normal` instead.", # call to `petab1to2` stacklevel=9, @@ -504,7 +504,7 @@ def update_prior(row): if new_prior_type not in v2.C.PRIOR_DISTRIBUTIONS: raise NotImplementedError( f"PEtab v2 does not support prior type `{new_prior_type}' " - f"required for parameter `{row.name}'." + f"required for parameter `{row[v1.C.PARAMETER_ID]}'." ) return new_prior_type