experimaestro 1.7.0rc3__tar.gz → 1.7.1__tar.gz

{experimaestro-1.7.0rc3 → experimaestro-1.7.1}/PKG-INFO

@@ -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 → experimaestro-1.7.1}/pyproject.toml

@@ -20,7 +20,7 @@ include = [
     "src/experimaestro/mkdocs/style.css",
     { path="src/experimaestro/server/data/*", format=['sdist', 'wheel']}
 ]
-version = "1.7.0-rc3"
+version = "1.7.1"
 repository = "https://github.com/experimaestro/experimaestro-python"
 documentation = "https://experimaestro-python.readthedocs.io/"
 
@@ -122,7 +122,7 @@ warn_unused_ignores = true
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.7.0rc3"
-changelog_start_rev = "0.15.0"
-tag_format = "v$version"
-update_changelog_on_bump = true
+version = "1.7.1"
+changelog_start_rev = "v1.0.0"
+tag_format = "v$major.$minor.$patch$prerelease"
+# update_changelog_on_bump = true

{experimaestro-1.7.0rc3 → experimaestro-1.7.1}/src/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-1.7.0rc3 → experimaestro-1.7.1}/src/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-1.7.0rc3 → experimaestro-1.7.1}/src/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"