Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move petab imports for PetabImporter #1355

Merged
merged 4 commits into from
Apr 17, 2024
Merged

Move petab imports for PetabImporter #1355

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8ece81
move petab imports outside of try/except
m-philipps Apr 3, 2024
20aa625
Merge branch 'develop' into fix_1340
dweindl Apr 5, 2024
a0a79b4
Merge branch 'develop' into fix_1340
dweindl Apr 15, 2024
5b9d146
Merge branch 'develop' into fix_1340
m-philipps Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions pypesto/petab/importer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@

import numpy as np
import pandas as pd
import petab
from petab.C import (
ESTIMATE,
NOISE_PARAMETERS,
OBSERVABLE_ID,
PREEQUILIBRATION_CONDITION_ID,
SIMULATION_CONDITION_ID,
)
from petab.models import MODEL_TYPE_SBML

from ..C import (
CENSORED,
Expand Down Expand Up @@ -50,16 +59,7 @@
import amici.petab.conditions
import amici.petab.parameter_mapping
import amici.petab.simulations
import petab
from amici.petab.import_helpers import check_model
from petab.C import (
ESTIMATE,
NOISE_PARAMETERS,
OBSERVABLE_ID,
PREEQUILIBRATION_CONDITION_ID,
SIMULATION_CONDITION_ID,
)
from petab.models import MODEL_TYPE_SBML
except ImportError:
amici = None

Expand Down
Loading