experimaestro 1.6.0__tar.gz → 1.6.1__tar.gz

{experimaestro-1.6.0 → experimaestro-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: experimaestro
-Version: 1.6.0
+Version: 1.6.1
 Summary: "Experimaestro is a computer science experiment manager"
 License: GPL-3
 Keywords: experiment manager

{experimaestro-1.6.0 → experimaestro-1.6.1}/pyproject.toml

@@ -19,7 +19,7 @@ include = [
     "src/experimaestro/sphinx/static/experimaestro.css",
     "src/experimaestro/mkdocs/style.css"
 ]
-version = "1.6.0"
+version = "1.6.1"
 repository = "https://github.com/experimaestro/experimaestro-python"
 documentation = "https://experimaestro-python.readthedocs.io/"
 
@@ -119,7 +119,7 @@ warn_unused_ignores = true
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.6.0"
+version = "1.6.1"
 changelog_start_rev = "0.15.0"
 tag_format = "v$version"
 update_changelog_on_bump = true

{experimaestro-1.6.0 → experimaestro-1.6.1}/src/experimaestro/core/objects.py

@@ -1340,8 +1340,14 @@ class ConfigInformation:
                     sys.modules[module_name] = mod
                     spec.loader.exec_module(mod)
             else:
-                logger.debug("Importing module %s", definition["module"])
-                mod = importlib.import_module(module_name)
+                try:
+                    logger.debug("Importing module %s", definition["module"])
+                    mod = importlib.import_module(module_name)
+                except ModuleNotFoundError:
+                    # More hints on the nature of the error
+                    logging.warning("(1) Either the python path is wrong – %s", ":".join(sys.path))
+                    logging.warning("(2) There is not __init__.py in your module")
+                    raise
 
             cls = getqualattr(mod, definition["type"])
 

{experimaestro-1.6.0 → experimaestro-1.6.1}/src/experimaestro/experiments/cli.py

@@ -208,29 +208,27 @@ def experiments_cli(  # noqa: C901
 
     # --- Finds the "run" function
 
-    try:
-        for path in pythonpath:
-            sys.path.append(str(path))
-
-        if xp_file:
-            if not xp_file.exists() and xp_file.suffix != ".py":
-                xp_file = xp_file.with_suffix(".py")
-            xp_file: Path = Path(yaml_file).parent / xp_file
-            with open(xp_file) as src:
-                module_name = xp_file.with_suffix("").name
-                mod = imp.load_module(
-                    module_name,
-                    src,
-                    str(xp_file.absolute()),
-                    (".py", "r", imp.PY_SOURCE),
-                )
-        else:
-            # Module
-            mod = importlib.import_module(module_name)
-
-        helper = getattr(mod, "run", None)
-    finally:
-        pass
+    # Modifies the Python path
+    for path in pythonpath:
+        sys.path.append(str(path))
+
+    if xp_file:
+        if not xp_file.exists() and xp_file.suffix != ".py":
+            xp_file = xp_file.with_suffix(".py")
+        xp_file: Path = Path(yaml_file).parent / xp_file
+        with open(xp_file) as src:
+            module_name = xp_file.with_suffix("").name
+            mod = imp.load_module(
+                module_name,
+                src,
+                str(xp_file.absolute()),
+                (".py", "r", imp.PY_SOURCE),
+            )
+    else:
+        # Module
+        mod = importlib.import_module(module_name)
+
+    helper = getattr(mod, "run", None)
 
     # --- ... and runs it
     if helper is None: