Merge pull request #546 from OpenBioSim/fix_545

Author: lohedges

pixi.toml

@@ -8,7 +8,6 @@ python = ">=3.10"
 configargparse = "*"
 ipywidgets = "*"
 kcombu_bss = "*"
-lazy_import = "*"
 loguru = "*"
 lomap2 = "*"
 networkx = "*"

recipes/biosimspace/recipe.yaml

@@ -22,7 +22,6 @@ requirements:
     - configargparse
     - ipywidgets
     - kcombu_bss
-    - lazy_import
     - loguru
     - lomap2
     - networkx

src/BioSimSpace/Sandpit/Exscientia/__init__.py

@@ -238,35 +238,31 @@ def _isVerbose():
 
 # Lazy load submodules if possible.
 if _can_lazy_import:
-    import lazy_import as _lazy_import
-
-    Align = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Align")
-    Box = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Box")
-    Convert = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Convert")
-    FreeEnergy = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.FreeEnergy")
-    Gateway = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Gateway")
-    IO = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.IO")
-    Metadynamics = _lazy_import.lazy_module(
-        "BioSimSpace.Sandpit.Exscientia.Metadynamics"
-    )
-    MD = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.MD")
-    Node = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Node")
-    Notebook = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Notebook")
-    Parameters = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Parameters")
-    Process = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Process")
-    Protocol = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Protocol")
-    Solvent = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Solvent")
-    Stream = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Stream")
-    Trajectory = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Trajectory")
-    Types = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Types")
-    Units = _lazy_import.lazy_module("BioSimSpace.Sandpit.Exscientia.Units")
-    _SireWrappers = _lazy_import.lazy_module(
-        "BioSimSpace.Sandpit.Exscientia._SireWrappers"
-    )
+    from sire._lazy_import import lazy_module as _lazy_module
+
+    Align = _lazy_module("BioSimSpace.Sandpit.Exscientia.Align")
+    Box = _lazy_module("BioSimSpace.Sandpit.Exscientia.Box")
+    Convert = _lazy_module("BioSimSpace.Sandpit.Exscientia.Convert")
+    FreeEnergy = _lazy_module("BioSimSpace.Sandpit.Exscientia.FreeEnergy")
+    Gateway = _lazy_module("BioSimSpace.Sandpit.Exscientia.Gateway")
+    IO = _lazy_module("BioSimSpace.Sandpit.Exscientia.IO")
+    Metadynamics = _lazy_module("BioSimSpace.Sandpit.Exscientia.Metadynamics")
+    MD = _lazy_module("BioSimSpace.Sandpit.Exscientia.MD")
+    Node = _lazy_module("BioSimSpace.Sandpit.Exscientia.Node")
+    Notebook = _lazy_module("BioSimSpace.Sandpit.Exscientia.Notebook")
+    Parameters = _lazy_module("BioSimSpace.Sandpit.Exscientia.Parameters")
+    Process = _lazy_module("BioSimSpace.Sandpit.Exscientia.Process")
+    Protocol = _lazy_module("BioSimSpace.Sandpit.Exscientia.Protocol")
+    Solvent = _lazy_module("BioSimSpace.Sandpit.Exscientia.Solvent")
+    Stream = _lazy_module("BioSimSpace.Sandpit.Exscientia.Stream")
+    Trajectory = _lazy_module("BioSimSpace.Sandpit.Exscientia.Trajectory")
+    Types = _lazy_module("BioSimSpace.Sandpit.Exscientia.Types")
+    Units = _lazy_module("BioSimSpace.Sandpit.Exscientia.Units")
+    _SireWrappers = _lazy_module("BioSimSpace.Sandpit.Exscientia._SireWrappers")
 
     from . import _Exceptions, _Utils
 
-    del _lazy_import
+    del _lazy_module
 else:
     from . import (
         IO,

src/BioSimSpace/__init__.py

@@ -238,31 +238,31 @@ def _isVerbose():
 
 # Lazy import submodules if possible.
 if _can_lazy_import:
-    import lazy_import as _lazy_import
-
-    Align = _lazy_import.lazy_module("BioSimSpace.Align")
-    Box = _lazy_import.lazy_module("BioSimSpace.Box")
-    Convert = _lazy_import.lazy_module("BioSimSpace.Convert")
-    FreeEnergy = _lazy_import.lazy_module("BioSimSpace.FreeEnergy")
-    Gateway = _lazy_import.lazy_module("BioSimSpace.Gateway")
-    IO = _lazy_import.lazy_module("BioSimSpace.IO")
-    Metadynamics = _lazy_import.lazy_module("BioSimSpace.Metadynamics")
-    MD = _lazy_import.lazy_module("BioSimSpace.MD")
-    Node = _lazy_import.lazy_module("BioSimSpace.Node")
-    Notebook = _lazy_import.lazy_module("BioSimSpace.Notebook")
-    Parameters = _lazy_import.lazy_module("BioSimSpace.Parameters")
-    Process = _lazy_import.lazy_module("BioSimSpace.Process")
-    Protocol = _lazy_import.lazy_module("BioSimSpace.Protocol")
-    Solvent = _lazy_import.lazy_module("BioSimSpace.Solvent")
-    Stream = _lazy_import.lazy_module("BioSimSpace.Stream")
-    Trajectory = _lazy_import.lazy_module("BioSimSpace.Trajectory")
-    Types = _lazy_import.lazy_module("BioSimSpace.Types")
-    Units = _lazy_import.lazy_module("BioSimSpace.Units")
-    _SireWrappers = _lazy_import.lazy_module("BioSimSpace._SireWrappers")
+    from sire._lazy_import import lazy_module as _lazy_module
+
+    Align = _lazy_module("BioSimSpace.Align")
+    Box = _lazy_module("BioSimSpace.Box")
+    Convert = _lazy_module("BioSimSpace.Convert")
+    FreeEnergy = _lazy_module("BioSimSpace.FreeEnergy")
+    Gateway = _lazy_module("BioSimSpace.Gateway")
+    IO = _lazy_module("BioSimSpace.IO")
+    Metadynamics = _lazy_module("BioSimSpace.Metadynamics")
+    MD = _lazy_module("BioSimSpace.MD")
+    Node = _lazy_module("BioSimSpace.Node")
+    Notebook = _lazy_module("BioSimSpace.Notebook")
+    Parameters = _lazy_module("BioSimSpace.Parameters")
+    Process = _lazy_module("BioSimSpace.Process")
+    Protocol = _lazy_module("BioSimSpace.Protocol")
+    Solvent = _lazy_module("BioSimSpace.Solvent")
+    Stream = _lazy_module("BioSimSpace.Stream")
+    Trajectory = _lazy_module("BioSimSpace.Trajectory")
+    Types = _lazy_module("BioSimSpace.Types")
+    Units = _lazy_module("BioSimSpace.Units")
+    _SireWrappers = _lazy_module("BioSimSpace._SireWrappers")
 
     from . import _Exceptions, _Utils
 
-    del _lazy_import
+    del _lazy_module
 else:
     from . import (
         IO,