Skip to content

Commit

Permalink
Update imports in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ioannis-vm committed Oct 22, 2024
1 parent d4e1511 commit fece85c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 23 deletions.
39 changes: 21 additions & 18 deletions pelicun/tests/dl_calculation/e7/auto_HU_NJ.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,23 +46,26 @@
from __future__ import annotations

import pandas as pd
from BuildingClassRulesets import building_class
from FloodClassRulesets import FL_config
from WindCECBRulesets import CECB_config
from WindCERBRulesets import CERB_config
from WindMECBRulesets import MECB_config
from WindMERBRulesets import MERB_config
from WindMetaVarRulesets import parse_BIM
from WindMHRulesets import MH_config
from WindMLRIRulesets import MLRI_config
from WindMLRMRulesets import MLRM_config
from WindMMUHRulesets import MMUH_config
from WindMSFRulesets import MSF_config
from WindSECBRulesets import SECB_config
from WindSERBRulesets import SERB_config
from WindSPMBRulesets import SPMB_config
from WindWMUHRulesets import WMUH_config
from WindWSFRulesets import WSF_config

from pelicun.tests.dl_calculation.rulesets.BuildingClassRulesets import (
building_class,
)
from pelicun.tests.dl_calculation.rulesets.FloodClassRulesets import FL_config
from pelicun.tests.dl_calculation.rulesets.WindCECBRulesets import CECB_config
from pelicun.tests.dl_calculation.rulesets.WindCERBRulesets import CERB_config
from pelicun.tests.dl_calculation.rulesets.WindMECBRulesets import MECB_config
from pelicun.tests.dl_calculation.rulesets.WindMERBRulesets import MERB_config
from pelicun.tests.dl_calculation.rulesets.WindMetaVarRulesets import parse_BIM
from pelicun.tests.dl_calculation.rulesets.WindMHRulesets import MH_config
from pelicun.tests.dl_calculation.rulesets.WindMLRIRulesets import MLRI_config
from pelicun.tests.dl_calculation.rulesets.WindMLRMRulesets import MLRM_config
from pelicun.tests.dl_calculation.rulesets.WindMMUHRulesets import MMUH_config
from pelicun.tests.dl_calculation.rulesets.WindMSFRulesets import MSF_config
from pelicun.tests.dl_calculation.rulesets.WindSECBRulesets import SECB_config
from pelicun.tests.dl_calculation.rulesets.WindSERBRulesets import SERB_config
from pelicun.tests.dl_calculation.rulesets.WindSPMBRulesets import SPMB_config
from pelicun.tests.dl_calculation.rulesets.WindWMUHRulesets import WMUH_config
from pelicun.tests.dl_calculation.rulesets.WindWSFRulesets import WSF_config


def auto_populate(aim: dict) -> tuple[dict, dict, pd.DataFrame]: # noqa: C901
Expand Down Expand Up @@ -98,7 +101,7 @@ def auto_populate(aim: dict) -> tuple[dict, dict, pd.DataFrame]: # noqa: C901
gi = aim.get('GeneralInformation')

# parse the GI data
gi_ap = parse_BIM(gi, location='NJ', hazards=['wind', 'inundation'])
gi_ap = parse_BIM(gi, location='NJ', hazards=['wind', 'inundation']) # type: ignore

# identify the building class
bldg_class = building_class(gi_ap, hazard='wind')
Expand Down
11 changes: 6 additions & 5 deletions pelicun/tests/dl_calculation/e8/auto_HU_LA.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@
import contextlib

import pandas as pd
from BldgClassRulesets import building_class
from MetaVarRulesets import parse_BIM
from WindWMUHRulesets import WMUH_config
from WindWSFRulesets import WSF_config

from pelicun.tests.dl_calculation.rulesets.BldgClassRulesets import building_class
from pelicun.tests.dl_calculation.rulesets.MetaVarRulesets import parse_BIM
from pelicun.tests.dl_calculation.rulesets.WindWMUHRulesets import WMUH_config
from pelicun.tests.dl_calculation.rulesets.WindWSFRulesets import WSF_config


def auto_populate(aim: dict) -> tuple[dict, dict, pd.DataFrame]:
Expand Down Expand Up @@ -89,7 +90,7 @@ def auto_populate(aim: dict) -> tuple[dict, dict, pd.DataFrame]:

# parse the GI data
gi_ap = parse_BIM(
gi,
gi, # type: ignore
location='LA',
hazards=[
'wind',
Expand Down

0 comments on commit fece85c

Please sign in to comment.