Skip to content

Commit c9443a1

Browse files
authored
Release 0.3.2
2 parents c5f2513 + e95c2f6 commit c9443a1

File tree

7 files changed

+12
-348
lines changed

7 files changed

+12
-348
lines changed

doc/problem_definition.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ can be specified like
109109
:header-rows: 1
110110

111111
* - model_subspace_id
112-
- petab_yaml
112+
- model_subspace_petab_yaml
113113
- p1
114114
- p2
115115
* - subspace1
@@ -156,7 +156,7 @@ Brief format description
156156
- ``model_subspace_indices``: The indices that locate this model in its model subspace.
157157
- ``criteria``: The value of the criterion by which model selection was performed, at least. Optionally, other criterion values too.
158158
- ``model_hash``: The model hash, generated by the PEtab Select library. The format is ``[MODEL_SUBSPACE_ID]-[MODEL_SUBSPACE_INDICES_HASH]``. If all parameters are in the model are defined like ``0;estimate``, then the hash is a string of ``1`` and ``0``, for parameters that are estimated or not, respectively.
159-
- ``model_subspace_petab_yaml``: Same as in model space files (see ``petab_yaml``).
159+
- ``model_subspace_petab_yaml``: Same as in model space files.
160160
- ``estimated_parameters``: Parameter estimates, including all estimated parameters that are not in the model selection problem; i.e., parameters that are set to be estimated in the model subspace PEtab problem but don't appear in the column header of the model space file.
161161
- ``iteration``: The iteration of model selection in which this model appeared.
162162
- ``model_id``: The model ID.

petab_select/model_subspace.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,16 @@ def from_definition(
733733
The model subspace.
734734
"""
735735
model_subspace_id = definition.pop(MODEL_SUBSPACE_ID)
736-
petab_yaml = definition.pop(MODEL_SUBSPACE_PETAB_YAML)
736+
if "petab_yaml" in definition:
737+
petab_yaml = definition.pop("petab_yaml")
738+
warnings.warn(
739+
"Change the `petab_yaml` column to "
740+
"`model_subspace_petab_yaml`, in the model space TSV.",
741+
DeprecationWarning,
742+
stacklevel=1,
743+
)
744+
else:
745+
petab_yaml = definition.pop(MODEL_SUBSPACE_PETAB_YAML)
737746
parameters = {
738747
column_id: decompress_parameter_values(value)
739748
for column_id, value in definition.items()

pyproject.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ plot = [
3434
test = [
3535
"pytest >= 5.4.3",
3636
"pytest-cov >= 2.10.0",
37-
"amici >= 0.11.25",
38-
"fides >= 0.7.5",
39-
"pypesto >= 0.5.4",
40-
#"pypesto @ git+https://github.com/ICB-DCM/pyPESTO.git@select_mkstd#egg=pypesto",
4137
"tox >= 3.12.4",
4238
]
4339
doc = [

test/pypesto/__init__.py

Whitespace-only changes.

test/pypesto/generate_expected_models.py

Lines changed: 0 additions & 90 deletions
This file was deleted.

test/pypesto/regenerate_model_hashes.py

Lines changed: 0 additions & 34 deletions
This file was deleted.

test/pypesto/test_pypesto.py

Lines changed: 0 additions & 217 deletions
This file was deleted.

0 commit comments

Comments
 (0)