experimaestro 1.7.0rc3__py3-none-any.whl → 1.7.1__py3-none-any.whl

experimaestro/experiments/cli.py

@@ -1,4 +1,3 @@
-import imp
 import importlib
 import inspect
 import json
@@ -68,6 +67,12 @@ class ConfigurationLoader:
 
         with yaml_file.open("rt") as fp:
             _data = yaml.full_load(fp)
+
+        if "file" in _data:
+            path = Path(_data["file"])
+            if not path.is_absolute():
+                _data["file"] = str((yaml_file.parent / path).resolve())
+
         if parent := _data.get("parent", None):
             self.load(yaml_file.parent / parent)
 
@@ -193,7 +198,7 @@ def experiments_cli(  # noqa: C901
             ), "Module name and experiment file are mutually exclusive options"
             xp_file = Path(xp_file)
             if not python_path:
-                python_path.append(xp_file.parent)
+                python_path.append(xp_file.parent.absolute())
             logging.info(
                 "Using python path: %s", ", ".join(str(s) for s in python_path)
             )
@@ -220,14 +225,12 @@ def experiments_cli(  # noqa: C901
         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),
-            )
+        module_name = xp_file.with_suffix("").name
+        spec = importlib.util.spec_from_file_location(
+            module_name, str(xp_file.absolute())
+        )
+        mod = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(mod)
     else:
         # Module
         try:

experimaestro/sphinx/__init__.py

@@ -12,11 +12,8 @@ from sphinx import addnodes
 from sphinx.ext.autodoc import ClassDocumenter, Documenter, restify
 from sphinx.locale import _
 from sphinx.util import inspect, logging
-from sphinx.domains.python import (
-    PyClasslike,
-    PyAttribute,
-    directives,  # noqa: F401
-)
+from sphinx.domains.python import PyClasslike, PyAttribute, directives
+from sphinx.domains.python import PyObject  # noqa: F401
 from sphinx.addnodes import desc_signature
 from sphinx.util.typing import OptionSpec
 from docutils.statemachine import StringList

experimaestro/tests/launchers/bin/sbatch

@@ -63,9 +63,9 @@ while IFS= read -r line; do
     esac
 done < "$1"
 
+cd "$chdir"
 echo "Starting $@ ${args[@]} > $stdout 2> $stderr" >&2
 (
-    if test "$chdir"; then cd "$chdir"; fi
     export PATH="${CURDIR}/bin:$PATH"
     eval "$@" "${args[@]}"
     echo $? > "$XPM_SLURM_DIR/jobs/$$.status"

{experimaestro-1.7.0rc3.dist-info → experimaestro-1.7.1.dist-info}/METADATA

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

{experimaestro-1.7.0rc3.dist-info → experimaestro-1.7.1.dist-info}/RECORD

@@ -22,7 +22,7 @@ experimaestro/core/types.py,sha256=gSLv9F1HszVxI8jla6e-aVVS7q3KBwSzG1MImUHdGMg,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=fvHz2aih7Aw1DK3GoVkeaVtG3r1tU6qbnwIv-uD0eVI,8697
+experimaestro/experiments/cli.py,sha256=u_s2fzkKj7sf3dOVREqslrb3PVO2vfFUjH3iTK8_lmA,8857
 experimaestro/experiments/configuration.py,sha256=cFDiUHnUGblJsctAUxAqx0jlM7_Ja_527lzk-4G-44k,1368
 experimaestro/generators.py,sha256=DQsEgdMwRUud9suWr-QGxI3vCO5sywP6MVGZWRNQXkk,1372
 experimaestro/huggingface.py,sha256=gnVlr6SZnbutYz4PLH0Q77n1TRF-uk-dR-3UFzFqAY0,2956
@@ -87,7 +87,7 @@ experimaestro/server/data/index.js.map,sha256=cv7KF28Uq5dy7Ux3yRnoSVztrOFVid359f
 experimaestro/server/data/login.html,sha256=4dvhSOn6DHp_tbmzqIKrqq2uAo0sAUbgLVD0lTnPp4s,511
 experimaestro/server/data/manifest.json,sha256=EpzHQZzrGh9c1Kf63nrqvI33H1cm0nLYfdh5lDm8ijI,318
 experimaestro/settings.py,sha256=U6gTVBL5Z4Rk0_7BAVoavVJKN2sQNRpspE-601Elfys,3170
-experimaestro/sphinx/__init__.py,sha256=xac4NmlxvciVONXfr3CChHH7AxZeAuQoC1MYL4Hwu3g,9440
+experimaestro/sphinx/__init__.py,sha256=HAofa65lCLAUOShgWwJIGEEOPKzu4VEs5LZd46V_Bng,9466
 experimaestro/sphinx/static/experimaestro.css,sha256=0rEgt1LoDdD-a_R5rVfWZ19zD1gR-1L7q3f4UibIB58,294
 experimaestro/taskglobals.py,sha256=Lp0bqobVLndR7fOtF9qPI7utTKQXXwTdVN6l5Av9Dc4,660
 experimaestro/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -98,7 +98,7 @@ experimaestro/tests/connectors/utils.py,sha256=9sM3Pwy2nRfSr7pwQoOoSCDhBrEcDsEEl
 experimaestro/tests/definitions_types.py,sha256=nMoQxZxhTJAYV87Ce9F2dAITxXGHf7Uw5j-MKsZ3LmQ,399
 experimaestro/tests/launchers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 experimaestro/tests/launchers/bin/sacct,sha256=9mmRAYCE4RBSBOf7aanhFw9hzujOUlcw3OJmZJ3K-Wc,639
-experimaestro/tests/launchers/bin/sbatch,sha256=MGzCDw6ywc973nMViPijwLzJcAW-ghJynMJA00h9AoQ,1746
+experimaestro/tests/launchers/bin/sbatch,sha256=KgG4xUiIpELHBWLjnM7IUBu5jKiIGnILS9HfHE5eVFk,1715
 experimaestro/tests/launchers/bin/srun,sha256=3oE3qq0UFpVtTvXfR1kH3tovFYX74fp1Fk-o8zgsaJA,47
 experimaestro/tests/launchers/bin/test.py,sha256=MbxdAd2Sf7T-Hj3ldmrtngbQuBdNOkXjMcICJTf39wI,477
 experimaestro/tests/launchers/common.py,sha256=E09KhrQfNQNZbaeVkXBgHk2906DvaCEU7CqEQvLbZTE,2994
@@ -147,8 +147,8 @@ experimaestro/utils/jupyter.py,sha256=JcEo2yQK7x3Cr1tNl5FqGMZOICxCv9DwMvL5xsWdQP
 experimaestro/utils/resources.py,sha256=j-nvsTFwmgENMoVGOD2Ap-UD3WU85WkI0IgeSszMCX4,1328
 experimaestro/utils/settings.py,sha256=jpFMqF0DLL4_P1xGal0zVR5cOrdD8O0Y2IOYvnRgN3k,793
 experimaestro/xpmutils.py,sha256=S21eMbDYsHfvmZ1HmKpq5Pz5O-1HnCLYxKbyTBbASyQ,638
-experimaestro-1.7.0rc3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-experimaestro-1.7.0rc3.dist-info/METADATA,sha256=-fuyq-zQ7nqyCb4NJ0fbTWp5YTZKgFDk6o26noSDrJQ,6162
-experimaestro-1.7.0rc3.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-experimaestro-1.7.0rc3.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
-experimaestro-1.7.0rc3.dist-info/RECORD,,
+experimaestro-1.7.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+experimaestro-1.7.1.dist-info/METADATA,sha256=8Z0vHJMLxWmtDlCrdC2FpQOobAtBIfqMHtQGgjmi7TU,6159
+experimaestro-1.7.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+experimaestro-1.7.1.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
+experimaestro-1.7.1.dist-info/RECORD,,