experimaestro 1.5.12__tar.gz → 1.5.14__tar.gz

{experimaestro-1.5.12 → experimaestro-1.5.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: experimaestro
-Version: 1.5.12
+Version: 1.5.14
 Summary: "Experimaestro is a computer science experiment manager"
 Home-page: https://github.com/experimaestro/experimaestro-python
 License: GPL-3
@@ -20,13 +20,13 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: arpeggio (>=2,<3)
 Requires-Dist: attrs (>=23.1.0,<24.0.0)
 Requires-Dist: click (>=8)
 Requires-Dist: decorator (>=5,<6)
 Requires-Dist: docstring-parser (>=0.15,<0.16)
-Requires-Dist: fabric (>=3,<4)
 Requires-Dist: fasteners (>=0.19,<0.20)
 Requires-Dist: flask (>=2.3,<3.0)
 Requires-Dist: flask-socketio (>=5.3,<6.0)

{experimaestro-1.5.12 → experimaestro-1.5.14}/pyproject.toml

@@ -19,7 +19,7 @@ include = [
     "src/experimaestro/sphinx/static/experimaestro.css",
     "src/experimaestro/mkdocs/style.css"
 ]
-version = "1.5.12"
+version = "1.5.14"
 repository = "https://github.com/experimaestro/experimaestro-python"
 documentation = "https://experimaestro-python.readthedocs.io/"
 
@@ -59,7 +59,6 @@ flask-socketio = "^5.3"
 arpeggio = "^2"
 watchdog = "^2"
 marshmallow = "^3.20"
-fabric = "^3"
 decorator = "^5"
 rpyc = ">=5,<7"
 
@@ -68,6 +67,7 @@ optional = true
 
 [tool.poetry.group.ssh.dependencies]
 paramiko = "^3.3"
+fabric = "^3"
 
 [tool.poetry.group.dev]
 optional = true
@@ -119,7 +119,7 @@ warn_unused_ignores = true
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.5.12"
+version = "1.5.14"
 changelog_start_rev = "0.15.0"
 tag_format = "v$version"
 update_changelog_on_bump = true

{experimaestro-1.5.12 → experimaestro-1.5.14}/src/experimaestro/connectors/ssh.py

@@ -10,9 +10,6 @@ import io
 import os
 import re
 from experimaestro.launcherfinder import LauncherRegistry
-from fabric import Connection
-from invoke import Promise
-import invoke.exceptions
 from urllib.parse import urlparse
 from itertools import chain
 from . import Connector
@@ -25,6 +22,22 @@ from . import (
 from experimaestro.locking import Lock
 from experimaestro.tokens import Token
 
+try:
+    from fabric import Connection
+    from invoke import Promise
+    from invoke.exceptions import Failure
+except Exception:
+    # Just define placeholders
+    class Connection:
+        pass
+
+    class Promise:
+        pass
+
+    class Failure(Exception):
+        pass
+
+
 # Might be wise to switch to https://github.com/marian-code/ssh-utilities
 
 
@@ -178,7 +191,7 @@ class SshProcess(Process):
     def wait(self) -> int:
         try:
             self.promise.join()
-        except invoke.exceptions.Failure:
+        except Failure:
             raise
 
 

{experimaestro-1.5.12 → experimaestro-1.5.14}/src/experimaestro/core/objects.py

@@ -583,6 +583,9 @@ class ConfigInformation:
         # State information
         self.job = None
 
+        #: True when this configuration was loaded from disk
+        self.loaded = False
+
         # Explicitely added dependencies
         self.dependencies = []
 
@@ -846,8 +849,8 @@ class ConfigInformation:
                 dependencies, path + ["__init_tasks__"], taskids
             )
 
-        # Check for an associated task
-        if self.task:
+        # Check for an associated task (and not loaded)
+        if self.task and not self.loaded:
             if id(self.task) not in taskids:
                 taskids.add(id(self.task))
                 dependencies.add(self.task.__xpm__.dependency())
@@ -1385,12 +1388,13 @@ class ConfigInformation:
             else:
                 o.__init__()
                 xpminfo = o.__xpm__  # type: ConfigInformation
+                xpminfo.loaded = True
 
                 meta = definition.get("meta", None)
                 if meta:
                     xpminfo._meta = meta
                 if xpminfo.xpmtype.task is not None:
-                    o.__xpm__.job = object()
+                    xpminfo.job = object()
 
             # Set the fields
             for name, value in definition["fields"].items():