experimaestro 1.5.10__py3-none-any.whl → 1.5.13__py3-none-any.whl

experimaestro/connectors/ssh.py

@@ -1,5 +1,11 @@
+try:
+    from pathlib import Path, _posix_flavour
+except ImportError:
+    # Avoids problem with python 3.12 where this module does not work
+    # anyways
+    _posix_flavour = None
+
 from dataclasses import dataclass
-from pathlib import Path, _posix_flavour
 import io
 import os
 import re

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():

experimaestro/tests/test_ssh.py

@@ -1,14 +1,18 @@
+import sys
+import pytest
 from experimaestro.connectors.ssh import SshPath
 
 # --- Test SSH path and SSH path manipulation
 
 
+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="requires python3.10 or higher")
 def test_absolute():
     path = SshPath("ssh://host//a/path")
     assert path.host == "host"
     assert path.is_absolute()
 
 
+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="requires python3.10 or higher")
 def test_relative():
     path = SshPath("ssh://host")
     assert path.host == "host"
@@ -17,6 +21,7 @@ def test_relative():
     assert not path.is_absolute()
 
 
+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="requires python3.10 or higher")
 def test_relative_withpath():
     path = SshPath("ssh://host/relative/path")
     assert path.host == "host"
@@ -24,6 +29,7 @@ def test_relative_withpath():
     assert not path.is_absolute()
 
 
+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="requires python3.10 or higher")
 def test_relative_absolute():
     path = SshPath("ssh://host") / "/absolute/path"
     assert path.host == "host"
@@ -31,6 +37,7 @@ def test_relative_absolute():
     assert path.is_absolute()
 
 
+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="requires python3.10 or higher")
 def test_relative_compose():
     path = SshPath("ssh://host/abc") / "relative/path"
     assert path.host == "host"

{experimaestro-1.5.10.dist-info → experimaestro-1.5.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: experimaestro
-Version: 1.5.10
+Version: 1.5.13
 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.10.dist-info → experimaestro-1.5.13.dist-info}/RECORD

@@ -10,11 +10,11 @@ experimaestro/commandline.py,sha256=NS1ubme8DTJtDS2uWwdHLQiZsl6TSK1LkNxu39c3-cw,
 experimaestro/compat.py,sha256=dQqE2ZNHLM2wtdfp7fBRYMfC33qNehVf9J6FGRBUQhs,171
 experimaestro/connectors/__init__.py,sha256=hxcBSeVLk_7oyiIlS3l-9dGg1NGtShwvRD1tS7f8D2M,5461
 experimaestro/connectors/local.py,sha256=6tlaZb0tvNS2mjsapiVbfY7kIfLICJad137VXBMz-xo,5816
-experimaestro/connectors/ssh.py,sha256=88z0MYJl_K2jJTX5NBx4w5DJ_UGEbN40SPs2x9dfB-Q,8260
+experimaestro/connectors/ssh.py,sha256=Jk-64rwfQ9Gs_cZ8O62YviJ3M2rLaHAln2A2hdAmMW8,8400
 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=vTp_zjBJlYEhe0u55erJ5X-Lc8UuTb45NIFwfVZCPes,64142
+experimaestro/core/objects.py,sha256=M6g2f3klT0Z913yniwKBakChUKGnb2dOoW3hJHZi7do,64305
 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
@@ -118,7 +118,7 @@ experimaestro/tests/test_param.py,sha256=FcRF8HbjoW96SR6cTW3fqracLM4BivAsTq0iZvl
 experimaestro/tests/test_progress.py,sha256=wtIGQzlV3ldd_wMng11LinVESchW-1J954mCJNlG28E,7580
 experimaestro/tests/test_serializers.py,sha256=xSCezAM9yH_Ix1wr7j0au9SyBv9DtZ7b0zs2-Ynt-VM,2338
 experimaestro/tests/test_snippets.py,sha256=rojnyDjtmAMnSuDUj6Bv9XEgdP8oQf2nVc132JF8vsM,3081
-experimaestro/tests/test_ssh.py,sha256=JhwsS4lJWQeMhtnDfJhQqJ5dwEThqvcNBBgUq1EWvk0,979
+experimaestro/tests/test_ssh.py,sha256=KS1NWltiXrJBSStY9d4mwrexeqgNGWmhxuAU_WLQDAU,1449
 experimaestro/tests/test_tags.py,sha256=vfW99iFfw3m-pcJPy_-mtZsWbAt_Xw5k-u3dWoJbRWw,2921
 experimaestro/tests/test_tasks.py,sha256=bUSB_UT1MTN2P_RPHd4AT5NK-DFsgCVeFKSiXu3bEz8,9429
 experimaestro/tests/test_tokens.py,sha256=cW9qQU4PhbQY4_SgK8ICmKcYq8JVvLRTOYZzdtoS5N8,7826
@@ -139,8 +139,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.5.10.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-experimaestro-1.5.10.dist-info/METADATA,sha256=98TsVdWS-8gKbvEs29VSbqDjboe3FiI-ohOc58Y68n0,6266
-experimaestro-1.5.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-experimaestro-1.5.10.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
-experimaestro-1.5.10.dist-info/RECORD,,
+experimaestro-1.5.13.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+experimaestro-1.5.13.dist-info/METADATA,sha256=d18r9gMm58VlznetLeNun9NDyb86WN6ZCEFSunRdFEg,6286
+experimaestro-1.5.13.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+experimaestro-1.5.13.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
+experimaestro-1.5.13.dist-info/RECORD,,

{experimaestro-1.5.10.dist-info → experimaestro-1.5.13.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any