experimaestro 1.6.0__py3-none-any.whl → 1.6.1__py3-none-any.whl

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/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:

{experimaestro-1.6.0.dist-info → experimaestro-1.6.1.dist-info}/METADATA

@@ -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.dist-info → experimaestro-1.6.1.dist-info}/RECORD

@@ -14,7 +14,7 @@ experimaestro/connectors/ssh.py,sha256=P6XfCdC4mQTsFzgI-dEdx6AdVhwd0T6VrQpPmNpmi
 experimaestro/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 experimaestro/core/arguments.py,sha256=dW32opqNEsULYr6nR7Zk8PqHsSCbLPclfXofw27GTpI,5620
 experimaestro/core/context.py,sha256=Q8_ngiHRBZ0laavXRJNiDvdCprrnROVTWaHfrwMdlG4,2638
-experimaestro/core/objects.py,sha256=M6g2f3klT0Z913yniwKBakChUKGnb2dOoW3hJHZi7do,64305
+experimaestro/core/objects.py,sha256=Oh9S85enB_cuQhFxZqwNoJMcrbuPoESdTdEDcO4tAqM,64649
 experimaestro/core/objects.pyi,sha256=Adi2OKCW0-B9GROlEUgxxBDK6SHUqccTBHTofRRJE9M,7131
 experimaestro/core/serialization.py,sha256=9tg5ebLF3YeZ_zG9DiTHPLthppvo7io710ohD_dcLTo,3836
 experimaestro/core/serializers.py,sha256=R_CAMyjjfU1oi-eHU6VlEUixJpFayGqEPaYu7VsD9xA,1197
@@ -22,7 +22,7 @@ experimaestro/core/types.py,sha256=8alVqTA7aeIZ3FAaDux8IwoRPDbwVxzONVqnAL1A6QI,2
 experimaestro/core/utils.py,sha256=JfC3qGUS9b6FUHc2VxIYUI9ysNpXSQ1LjOBkjfZ8n7o,495
 experimaestro/exceptions.py,sha256=cUy83WHM3GeynxmMk6QRr5xsnpqUAdAoc-m3KQVrE2o,44
 experimaestro/experiments/__init__.py,sha256=GcpDUIbCvhnv6rxFdAp4wTffCVNTv-InY6fbQAlTy-o,159
-experimaestro/experiments/cli.py,sha256=Uu9GlCrwBvyp_sxmO4VLLcSwVVquKfdlYrxCXhlN7Kc,8447
+experimaestro/experiments/cli.py,sha256=AS6LcbY3O8tkQ8X-ushZcRVdLt1WbykwGP8CZ2BfgMw,8371
 experimaestro/experiments/configuration.py,sha256=cFDiUHnUGblJsctAUxAqx0jlM7_Ja_527lzk-4G-44k,1368
 experimaestro/generators.py,sha256=9NQ_TfDfASkArLnO4PF7s5Yoo9KWjlna2DCPzk5gJOI,1230
 experimaestro/huggingface.py,sha256=gnVlr6SZnbutYz4PLH0Q77n1TRF-uk-dR-3UFzFqAY0,2956
@@ -115,8 +115,8 @@ experimaestro/utils/jupyter.py,sha256=JcEo2yQK7x3Cr1tNl5FqGMZOICxCv9DwMvL5xsWdQP
 experimaestro/utils/resources.py,sha256=MaCQL9dLfze3lwyuBVeWF7Ki5fFSE1F0BGWrfaaHi1I,1135
 experimaestro/utils/settings.py,sha256=jpFMqF0DLL4_P1xGal0zVR5cOrdD8O0Y2IOYvnRgN3k,793
 experimaestro/xpmutils.py,sha256=S21eMbDYsHfvmZ1HmKpq5Pz5O-1HnCLYxKbyTBbASyQ,638
-experimaestro-1.6.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-experimaestro-1.6.0.dist-info/METADATA,sha256=ls8yp4BJZ_021MzRsuWAmIWLbKWz8apcxCwzKT8H7pM,6220
-experimaestro-1.6.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-experimaestro-1.6.0.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
-experimaestro-1.6.0.dist-info/RECORD,,
+experimaestro-1.6.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+experimaestro-1.6.1.dist-info/METADATA,sha256=23LdSFk3UzGvwsUqh3GLk_g-VTqZ_qvJa6SAYHXDGiI,6220
+experimaestro-1.6.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+experimaestro-1.6.1.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
+experimaestro-1.6.1.dist-info/RECORD,,