Skip to content

Commit 32efe7e

Browse files
committed
remove try: import as there are no longer optional dependencies
1 parent 607a5f0 commit 32efe7e

2 files changed

Lines changed: 2 additions & 10 deletions

File tree

runzi/tasks/oq_hazard/oq_disagg_task.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from nzshm_model.logic_tree import GMCMLogicTree, SourceLogicTree
2020
from nzshm_model.psha_adapter.openquake import OpenquakeModelPshaAdapter
2121
from nzshm_model.psha_adapter.openquake.hazard_config import OpenquakeConfig
22+
from toshi_hazard_store.scripts.ths_disagg_import import store_disagg
2223

2324
from runzi.arguments import SystemArgs, TaskLanguage
2425
from runzi.automation.local_config import (
@@ -54,11 +55,6 @@
5455

5556
log = logging.getLogger(__name__)
5657

57-
try:
58-
from toshi_hazard_store.scripts.ths_disagg_import import store_disagg
59-
except ModuleNotFoundError:
60-
log.info("not importing from toshi_hazard_store.scripts.ths_import due to missing dependencies")
61-
6258
default_system_args = SystemArgs(
6359
task_language=TaskLanguage.PYTHON,
6460
use_api=USE_API,

runzi/tasks/oq_hazard/oq_hazard_task.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from nzshm_model.logic_tree import GMCMLogicTree, SourceLogicTree
1919
from nzshm_model.psha_adapter.openquake import OpenquakeModelPshaAdapter
2020
from nzshm_model.psha_adapter.openquake.hazard_config import OpenquakeConfig
21+
from toshi_hazard_store.scripts.ths_rlz_import import store_hazard
2122

2223
from runzi.arguments import SystemArgs, TaskLanguage
2324
from runzi.automation.local_config import (
@@ -49,11 +50,6 @@
4950

5051
log = logging.getLogger(__name__)
5152

52-
try:
53-
from toshi_hazard_store.scripts.ths_rlz_import import store_hazard
54-
except ModuleNotFoundError:
55-
log.info("not importing from toshi_hazard_store.scripts.ths_import due to missing dependencies")
56-
5753
default_system_args = SystemArgs(
5854
task_language=TaskLanguage.PYTHON,
5955
use_api=USE_API,

0 commit comments

Comments
 (0)