Rename ert_shared to ert.shared and include ERT as requirement (#237)

* change ert_shared to ert.shared
equinor · Aug 19, 2022 · a41e333 · a41e333
1 parent 3a152ae
commit a41e333
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -2,4 +2,4 @@ xtgeo>=2.16
 PyYAML
 # skip pyarrow for RMS 11 and 12.0 which uses python 3.6.1 and too old numpy 1.13.3
 pyarrow; python_version > "3.6.1"
-jsonschema>=3.2.0
+jsonschema>=3.2.0
diff --git a/src/fmu/dataio/hook_implementations/jobs.py b/src/fmu/dataio/hook_implementations/jobs.py
@@ -1,5 +1,9 @@
-from ert_shared.plugins.plugin_manager import hook_implementation
-from ert_shared.plugins.plugin_response import plugin_response
+try:
+    from ert_shared.plugins.plugin_manager import hook_implementation
+    from ert_shared.plugins.plugin_response import plugin_response
+except ModuleNotFoundError:
+    from ert.shared.plugins.plugin_manager import hook_implementation
+    from ert.shared.plugins.plugin_response import plugin_response
 
 
 @hook_implementation

diff --git a/src/fmu/dataio/scripts/create_case_metadata.py b/src/fmu/dataio/scripts/create_case_metadata.py
@@ -13,8 +13,15 @@
 import logging
 from pathlib import Path
 
-from ert_shared.plugins.plugin_manager import hook_implementation  # type: ignore
-from res.job_queue import ErtScript  # type: ignore
+try:
+    from ert_shared.plugins.plugin_manager import hook_implementation  # type: ignore
+except ModuleNotFoundError:
+    from ert.shared.plugins.plugin_manager import hook_implementation
+
+try:
+    from ert import ErtScript  # type: ignore
+except ImportError:
+    from res.job_queue import ErtScript  # type: ignore
 
 from fmu.dataio import InitializeCase