cleaned up engine.__init__ so it only contains Submitter class

Author: tclose

pydra/compose/base/task.py

@@ -18,7 +18,6 @@
     attrs_fields,
     attrs_values,
 )
-from pydra.engine import lazy
 from pydra.utils.hash import Cache, hash_single, register_serializer
 from .field import Field, Arg, Out
 
@@ -295,6 +294,7 @@ def split(
             a reference to the job
         """
         from pydra.engine.state import unwrap_splitter
+        from pydra.engine import lazy
 
         if self._splitter and not overwrite:
             raise ValueError(

pydra/engine/__init__.py

@@ -1,25 +1,6 @@
 """The core of the workflow engine."""
 
-import __main__
-import logging
+from .submitter import Submitter
 
-__all__ = [
-    "logger",
-    "check_latest_version",
-]
 
-logger = logging.getLogger("pydra")
-
-
-def check_latest_version():
-    import etelemetry
-
-    return etelemetry.check_available_version("nipype/pydra", __version__, lgr=logger)
-
-
-# Run telemetry on import for interactive sessions, such as IPython, Jupyter notebooks, Python REPL
-# if not hasattr(__main__, "__file__"):
-#     from pydra.compose.base import Task
-
-#     if Task._etelemetry_version_data is None:
-#         Task._etelemetry_version_data = check_latest_version()
+__all__ = ["Submitter"]

pydra/engine/submitter.py

@@ -111,7 +111,7 @@ def __init__(
         if worker is None:
             worker = "debug"
 
-        from pydra.engine import check_latest_version
+        from pydra.utils.etelemetry import check_latest_version
 
         if Job._etelemetry_version_data is None:
             Job._etelemetry_version_data = check_latest_version()

pydra/utils/etelemetry.py

@@ -0,0 +1,20 @@
+import logging
+from ._version import __version__
+
+# import __main__
+
+logger = logging.getLogger("pydra")
+
+
+def check_latest_version():
+    import etelemetry
+
+    return etelemetry.check_available_version("nipype/pydra", __version__, lgr=logger)
+
+
+# Run telemetry on import for interactive sessions, such as IPython, Jupyter notebooks, Python REPL
+# if not hasattr(__main__, "__file__"):
+#     from pydra.compose.base import Task
+
+#     if Task._etelemetry_version_data is None:
+#         Task._etelemetry_version_data = check_latest_version()