experimaestro 1.7.0rc0__tar.gz → 1.7.0rc1__tar.gz

{experimaestro-1.7.0rc0 → experimaestro-1.7.0rc1}/PKG-INFO

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

{experimaestro-1.7.0rc0 → experimaestro-1.7.0rc1}/pyproject.toml

@@ -20,7 +20,7 @@ include = [
     "src/experimaestro/mkdocs/style.css",
     { path="src/experimaestro/server/data/*", format=['sdist', 'wheel']}
 ]
-version = "1.7.0-rc0"
+version = "1.7.0-rc1"
 repository = "https://github.com/experimaestro/experimaestro-python"
 documentation = "https://experimaestro-python.readthedocs.io/"
 
@@ -29,7 +29,10 @@ enable = false
 vcs = "git"
 style = "semver"
 dirty = true
-format-jinja = """{{ serialize_semver(base, ["rc" + revision|string]) }}"""
+format-jinja = """{%- set pre = [] -%}{%- set metadata = [] -%}
+{%- if revision is not none -%}{{ pre.append("rc" + revision|string) or "" }}{%- endif -%}
+{%- if distance > 0 -%}{{ metadata.append(distance|string) or "" }}{%- endif -%}
+{{ serialize_semver(base, pre, metadata)}}"""
 [build-system]
 requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
 build-backend = "poetry_dynamic_versioning.backend"

{experimaestro-1.7.0rc0 → experimaestro-1.7.0rc1}/src/experimaestro/launcherfinder/registry.py

@@ -1,5 +1,6 @@
 # Configuration registers
 
+from contextlib import contextmanager
 from typing import ClassVar, Dict, Optional, Set, Type, Union
 
 from pathlib import Path
@@ -36,6 +37,16 @@ def load_yaml(schema, path: Path):
         )
 
 
+@contextmanager
+def ensure_enter(fp):
+    """Behaves as a resource, whether it is one or not"""
+    if hasattr(fp, "__enter__"):
+        with fp as _fp:
+            yield _fp
+    else:
+        yield fp
+
+
 class LauncherRegistry:
     INSTANCES: ClassVar[Dict[Path, "LauncherRegistry"]] = {}
     CURRENT_CONFIG_DIR: ClassVar[Optional[Path]] = None
@@ -78,7 +89,7 @@ class LauncherRegistry:
 
             from importlib import util
 
-            with launchers_py.__fspath__() as fp:
+            with ensure_enter(launchers_py.__fspath__()) as fp:
                 spec = util.spec_from_file_location("xpm_launchers_conf", fp)
                 module = util.module_from_spec(spec)
                 spec.loader.exec_module(module)