GEOPY-2840: Fix RuntimeWarnings about importing driver module before package

simpeg_drivers/electricals/direct_current/three_dimensions/__init__.py

@@ -7,7 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import DC3DForwardDriver
-from .inversion import DC3DInversionDriver
-from .options import DC3DForwardOptions, DC3DInversionOptions

simpeg_drivers/electricals/direct_current/three_dimensions/forward.py

@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import DC3DForwardOptions
+from simpeg_drivers.electricals.direct_current.three_dimensions.options import (
+    DC3DForwardOptions,
+)
 
 
 class DC3DForwardDriver(ForwardDriver):

simpeg_drivers/electricals/direct_current/three_dimensions/inversion.py

@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import DC3DInversionOptions
+from simpeg_drivers.electricals.direct_current.three_dimensions.options import (
+    DC3DInversionOptions,
+)
 
 
 class DC3DInversionDriver(InversionDriver):

simpeg_drivers/electricals/direct_current/two_dimensions/__init__.py

@@ -7,7 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import DC2DForwardDriver
-from .inversion import DC2DInversionDriver
-from .options import DC2DForwardOptions, DC2DInversionOptions

simpeg_drivers/electricals/direct_current/two_dimensions/forward.py

@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import ForwardDriver
 from simpeg_drivers.electricals.base_2d import Base2DDriver
-
-from .options import DC2DForwardOptions
+from simpeg_drivers.electricals.direct_current.two_dimensions.options import (
+    DC2DForwardOptions,
+)
 
 
 class DC2DForwardDriver(ForwardDriver, Base2DDriver):

simpeg_drivers/electricals/direct_current/two_dimensions/inversion.py

@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import InversionDriver
 from simpeg_drivers.electricals.base_2d import Base2DDriver
-
-from .options import DC2DInversionOptions
+from simpeg_drivers.electricals.direct_current.two_dimensions.options import (
+    DC2DInversionOptions,
+)
 
 
 class DC2DInversionDriver(InversionDriver, Base2DDriver):

simpeg_drivers/electricals/induced_polarization/three_dimensions/__init__.py

@@ -7,10 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import IP3DForwardDriver
-from .inversion import IP3DInversionDriver
-from .options import (
-    IP3DForwardOptions,
-    IP3DInversionOptions,
-)

simpeg_drivers/electricals/induced_polarization/three_dimensions/forward.py

@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import IP3DForwardOptions
+from simpeg_drivers.electricals.induced_polarization.three_dimensions.options import (
+    IP3DForwardOptions,
+)
 
 
 class IP3DForwardDriver(ForwardDriver):

simpeg_drivers/electricals/induced_polarization/three_dimensions/inversion.py

@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import IP3DInversionOptions
+from simpeg_drivers.electricals.induced_polarization.three_dimensions.options import (
+    IP3DInversionOptions,
+)
 
 
 class IP3DInversionDriver(InversionDriver):

simpeg_drivers/electricals/induced_polarization/two_dimensions/__init__.py

@@ -7,10 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import IP2DForwardDriver
-from .inversion import IP2DInversionDriver
-from .options import (
-    IP2DForwardOptions,
-    IP2DInversionOptions,
-)

simpeg_drivers/electricals/induced_polarization/two_dimensions/forward.py

@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import ForwardDriver
 from simpeg_drivers.electricals.base_2d import Base2DDriver
-
-from .options import IP2DForwardOptions
+from simpeg_drivers.electricals.induced_polarization.two_dimensions.options import (
+    IP2DForwardOptions,
+)
 
 
 class IP2DForwardDriver(ForwardDriver, Base2DDriver):

simpeg_drivers/electricals/induced_polarization/two_dimensions/inversion.py

@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import InversionDriver
 from simpeg_drivers.electricals.base_2d import Base2DDriver
-
-from .options import IP2DInversionOptions
+from simpeg_drivers.electricals.induced_polarization.two_dimensions.options import (
+    IP2DInversionOptions,
+)
 
 
 class IP2DInversionDriver(InversionDriver, Base2DDriver):

simpeg_drivers/electromagnetics/frequency_domain/__init__.py

@@ -7,10 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import FDEMForwardDriver
-from .inversion import FDEMInversionDriver
-from .options import (
-    FDEMForwardOptions,
-    FDEMInversionOptions,
-)

simpeg_drivers/electromagnetics/frequency_domain/forward.py

@@ -15,8 +15,7 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import FDEMForwardOptions
+from simpeg_drivers.electromagnetics.frequency_domain.options import FDEMForwardOptions
 
 
 class FDEMForwardDriver(ForwardDriver):

simpeg_drivers/electromagnetics/frequency_domain/inversion.py

@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import FDEMInversionOptions
+from simpeg_drivers.electromagnetics.frequency_domain.options import (
+    FDEMInversionOptions,
+)
 
 
 class FDEMInversionDriver(InversionDriver):

simpeg_drivers/electromagnetics/frequency_domain_1d/__init__.py

@@ -7,10 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import FDEM1DForwardDriver
-from .inversion import FDEM1DInversionDriver
-from .options import (
-    FDEM1DForwardOptions,
-    FDEM1DInversionOptions,
-)

simpeg_drivers/electromagnetics/frequency_domain_1d/forward.py

@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import ForwardDriver
 from simpeg_drivers.electromagnetics.base_1d_driver import Base1DDriver
-
-from .options import FDEM1DForwardOptions
+from simpeg_drivers.electromagnetics.frequency_domain_1d.options import (
+    FDEM1DForwardOptions,
+)
 
 
 class FDEM1DForwardDriver(ForwardDriver, Base1DDriver):

simpeg_drivers/electromagnetics/frequency_domain_1d/inversion.py

@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import InversionDriver
 from simpeg_drivers.electromagnetics.base_1d_driver import Base1DDriver
-
-from .options import FDEM1DInversionOptions
+from simpeg_drivers.electromagnetics.frequency_domain_1d.options import (
+    FDEM1DInversionOptions,
+)
 
 
 class FDEM1DInversionDriver(InversionDriver, Base1DDriver):

simpeg_drivers/electromagnetics/time_domain/__init__.py

@@ -7,11 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-
-from .forward import TDEMForwardDriver
-from .inversion import TDEMInversionDriver
-from .options import (
-    TDEMForwardOptions,
-    TDEMInversionOptions,
-)

simpeg_drivers/electromagnetics/time_domain/forward.py

@@ -15,8 +15,7 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import TDEMForwardOptions
+from simpeg_drivers.electromagnetics.time_domain.options import TDEMForwardOptions
 
 
 class TDEMForwardDriver(ForwardDriver):

simpeg_drivers/electromagnetics/time_domain/inversion.py

@@ -15,8 +15,7 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import TDEMInversionOptions
+from simpeg_drivers.electromagnetics.time_domain.options import TDEMInversionOptions
 
 
 class TDEMInversionDriver(InversionDriver):

simpeg_drivers/electromagnetics/time_domain_1d/__init__.py

@@ -7,10 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import TDEM1DForwardDriver
-from .inversion import TDEM1DInversionDriver
-from .options import (
-    TDEM1DForwardOptions,
-    TDEM1DInversionOptions,
-)

simpeg_drivers/electromagnetics/time_domain_1d/forward.py

@@ -16,8 +16,7 @@
 
 from simpeg_drivers.driver import ForwardDriver
 from simpeg_drivers.electromagnetics.base_1d_driver import Base1DDriver
-
-from .options import TDEM1DForwardOptions
+from simpeg_drivers.electromagnetics.time_domain_1d.options import TDEM1DForwardOptions
 
 
 class TDEM1DForwardDriver(ForwardDriver, Base1DDriver):

simpeg_drivers/electromagnetics/time_domain_1d/inversion.py

@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import InversionDriver
 from simpeg_drivers.electromagnetics.base_1d_driver import Base1DDriver
-
-from .options import TDEM1DInversionOptions
+from simpeg_drivers.electromagnetics.time_domain_1d.options import (
+    TDEM1DInversionOptions,
+)
 
 
 class TDEM1DInversionDriver(InversionDriver, Base1DDriver):

simpeg_drivers/joint/joint_cross_gradient/__init__.py

@@ -7,6 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .driver import JointCrossGradientDriver
-from .options import JointCrossGradientOptions

simpeg_drivers/joint/joint_cross_gradient/driver.py

@@ -23,8 +23,7 @@
 from simpeg.regularization import CrossGradient
 
 from simpeg_drivers.joint.driver import BaseJointDriver
-
-from .options import JointCrossGradientOptions
+from simpeg_drivers.joint.joint_cross_gradient.options import JointCrossGradientOptions
 
 
 class JointCrossGradientDriver(BaseJointDriver):

simpeg_drivers/joint/joint_petrophysics/__init__.py

@@ -7,6 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .driver import JointPetrophysicsDriver
-from .options import JointPetrophysicsOptions

simpeg_drivers/joint/joint_petrophysics/driver.py

@@ -20,12 +20,8 @@
 from simpeg.objective_function import ComboObjectiveFunction
 from simpeg.regularization.pgi import PGIsmallness
 
-from simpeg_drivers.components.factories import (
-    DirectivesFactory,
-)
 from simpeg_drivers.joint.driver import BaseJointDriver
-
-from .options import JointPetrophysicsOptions
+from simpeg_drivers.joint.joint_petrophysics.options import JointPetrophysicsOptions
 
 
 class JointPetrophysicsDriver(BaseJointDriver):

simpeg_drivers/joint/joint_surveys/__init__.py

@@ -7,6 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .driver import JointSurveysDriver
-from .options import JointSurveysOptions

simpeg_drivers/joint/joint_surveys/driver.py

@@ -21,10 +21,9 @@
 
 from simpeg_drivers.driver import InversionDriver
 from simpeg_drivers.joint.driver import BaseJointDriver
+from simpeg_drivers.joint.joint_surveys.options import JointSurveysOptions
 from simpeg_drivers.options import ModelTypeEnum
 
-from .options import JointSurveysOptions
-
 
 logger = getLogger(__name__)
 

simpeg_drivers/natural_sources/__init__.py

@@ -7,13 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-
-from .magnetotellurics import (
-    MTForwardOptions,
-    MTInversionOptions,
-)
-from .tipper import TipperForwardOptions, TipperInversionOptions
-
-# pylint: disable=unused-import
-# flake8: noqa

simpeg_drivers/natural_sources/apparent_conductivity/__init__.py

@@ -7,11 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-
-from .forward import AppConForwardDriver
-from .inversion import AppConInversionDriver
-from .options import (
-    AppConForwardOptions,
-    AppConInversionOptions,
-)

simpeg_drivers/natural_sources/apparent_conductivity/forward.py

@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import AppConForwardOptions
+from simpeg_drivers.natural_sources.apparent_conductivity.options import (
+    AppConForwardOptions,
+)
 
 
 class AppConForwardDriver(ForwardDriver):

simpeg_drivers/natural_sources/apparent_conductivity/inversion.py

@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import AppConInversionOptions
+from simpeg_drivers.natural_sources.apparent_conductivity.options import (
+    AppConInversionOptions,
+)
 
 
 class AppConInversionDriver(InversionDriver):

simpeg_drivers/natural_sources/magnetotellurics/__init__.py

@@ -7,10 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import MTForwardDriver
-from .inversion import MTInversionDriver
-from .options import (
-    MTForwardOptions,
-    MTInversionOptions,
-)

simpeg_drivers/natural_sources/magnetotellurics/forward.py

@@ -15,8 +15,7 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import MTForwardOptions
+from simpeg_drivers.natural_sources.magnetotellurics.options import MTForwardOptions
 
 
 class MTForwardDriver(ForwardDriver):