Reverse import order

Try importing the new package names before importing the deprecated, avoiding a potential deprecation warning in case a compatibility package is installed.
equinor · Sep 20, 2022 · 25d16d9 · 25d16d9
1 parent c57858b
commit 25d16d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/xtgeoapp_grd3dmaps/hook_implementations/jobs.py b/src/xtgeoapp_grd3dmaps/hook_implementations/jobs.py
@@ -3,11 +3,11 @@
 from pkg_resources import resource_filename
 
 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
+except ModuleNotFoundError:
+    from ert_shared.plugins.plugin_manager import hook_implementation
+    from ert_shared.plugins.plugin_response import plugin_response
 
 PLUGIN_NAME = "xtgeoapp_grd3dmaps"
 

diff --git a/tests/test_vs_ert/test_hook_implementations.py b/tests/test_vs_ert/test_hook_implementations.py
@@ -6,20 +6,21 @@
 import pytest
 
 try:
-    import ert_shared  # noqa
+    import ert  # noqa
 except ImportError:
     try:
-        import ert # noqa
+        import ert_shared  # noqa
     except ImportError:
         pytest.skip(
             "Not testing ERT hooks when ERT is not installed", allow_module_level=True
         )
 
 import xtgeoapp_grd3dmaps.hook_implementations.jobs as jobs
+
 try:
-    from ert_shared.plugins.plugin_manager import ErtPluginManager
-except ModuleNotFoundError:
     from ert.shared.plugins.plugin_manager import ErtPluginManager
+except ModuleNotFoundError:
+    from ert_shared.plugins.plugin_manager import ErtPluginManager
 
 EXPECTED_JOBS = {
     "GRID3D_AVERAGE_MAP": "xtgeoapp_grd3dmaps/config_jobs/GRID3D_AVERAGE_MAP",