hpcflow-new2 0.2.0a161__py3-none-any.whl → 0.2.0a162__py3-none-any.whl

hpcflow/_version.py

@@ -1 +1 @@
-__version__ = "0.2.0a161"
+__version__ = "0.2.0a162"

hpcflow/sdk/core/element.py

@@ -244,7 +244,9 @@ class ElementResources(JSONLike):
         sub_dicts = ("scheduler_args", "shell_args")
         dct = {k: copy.deepcopy(v) for k, v in self.__dict__.items() if k not in exclude}
         if "options" in dct.get("scheduler_args", []):
-            dct["scheduler_args"]["options"] = tuple(dct["scheduler_args"]["options"])
+            dct["scheduler_args"]["options"] = _hash_dict(
+                dct["scheduler_args"]["options"]
+            )
 
         for k in sub_dicts:
             if k in dct:

hpcflow/tests/unit/test_element.py

@@ -603,3 +603,66 @@ def test_element_get_group_sequence_obj(new_null_config, tmp_path):
         8,
         9,
     ]
+
+
+def test_element_resources_get_jobscript_hash_equal_empty():
+    assert (
+        hf.ElementResources().get_jobscript_hash()
+        == hf.ElementResources().get_jobscript_hash()
+    )
+
+
+def test_element_resources_get_jobscript_hash_unequal_num_cores():
+    assert (
+        hf.ElementResources(num_cores=1).get_jobscript_hash()
+        != hf.ElementResources(num_cores=2).get_jobscript_hash()
+    )
+
+
+def test_element_resources_get_jobscript_hash_equal_num_cores():
+    assert (
+        hf.ElementResources(num_cores=1).get_jobscript_hash()
+        == hf.ElementResources(num_cores=1).get_jobscript_hash()
+    )
+
+
+def test_element_resources_get_jobscript_hash_unequal_scheduler_args_empty():
+
+    assert (
+        hf.ElementResources().get_jobscript_hash()
+        != hf.ElementResources(
+            scheduler_args={"options": {"--time": "01:00:00"}}
+        ).get_jobscript_hash()
+    )
+
+
+def test_element_resources_get_jobscript_hash_equal_non_truthy_scheduler_args():
+
+    assert (
+        hf.ElementResources().get_jobscript_hash()
+        == hf.ElementResources(scheduler_args={}).get_jobscript_hash()
+    )
+
+
+def test_element_resources_get_jobscript_hash_unequal_scheduler_args_diff_options():
+
+    assert (
+        hf.ElementResources(
+            scheduler_args={"options": {"--time": "02:00:00"}}
+        ).get_jobscript_hash()
+        != hf.ElementResources(
+            scheduler_args={"options": {"--partition": "MULTICORE"}}
+        ).get_jobscript_hash()
+    )
+
+
+def test_element_resources_get_jobscript_hash_unequal_scheduler_args_same_options():
+
+    assert (
+        hf.ElementResources(
+            scheduler_args={"options": {"--time": "02:00:00"}}
+        ).get_jobscript_hash()
+        != hf.ElementResources(
+            scheduler_args={"options": {"--time": "01:00:00"}}
+        ).get_jobscript_hash()
+    )

{hpcflow_new2-0.2.0a161.dist-info → hpcflow_new2-0.2.0a162.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hpcflow-new2
-Version: 0.2.0a161
+Version: 0.2.0a162
 Summary: Computational workflow management
 License: MIT
 Author: aplowman

{hpcflow_new2-0.2.0a161.dist-info → hpcflow_new2-0.2.0a162.dist-info}/RECORD

@@ -1,7 +1,7 @@
 hpcflow/__init__.py,sha256=WIETuRHeOp2SqUqHUzpjQ-lk9acbYv-6aWOhZPRdlhs,64
 hpcflow/__pyinstaller/__init__.py,sha256=YOzBlPSck6slucv6lJM9K80JtsJWxXRL00cv6tRj3oc,98
 hpcflow/__pyinstaller/hook-hpcflow.py,sha256=SeMopsPkhCyd9gqIrzwFNRj3ZlkUlUYl-74QYz61mo4,1089
-hpcflow/_version.py,sha256=f61tdocu5S9MzLcsCrrQ4yVYVvCmCf9Z86QwA-46gcI,26
+hpcflow/_version.py,sha256=F6Hs8T_jFERXgHCaaDirBoJpTlltPgUsSSt4BxvexP8,26
 hpcflow/app.py,sha256=d-kgfnZNlqlCi2H8bK26714brD_u3ibN3FaEZgjF9aA,1332
 hpcflow/cli.py,sha256=G2J3D9v6MnMWOWMMWK6UEKLn_6wnV9lT_qygEBBxg-I,66
 hpcflow/data/demo_data_manifest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -47,7 +47,7 @@ hpcflow/sdk/core/__init__.py,sha256=GcIklEsXy3M5PWpmxyhd2KoI0u6HjXRIjD_aR1bgRjo,
 hpcflow/sdk/core/actions.py,sha256=539vu9ts5u5Poah6-ZGOEANrb58NPEbhhoVlS7ajayE,74544
 hpcflow/sdk/core/command_files.py,sha256=mo7JzKko2WQ_DOFbJFyuvnnRN3pj1hiqPe7tRNSNDV4,18515
 hpcflow/sdk/core/commands.py,sha256=-Tiu7zVVwWr1xiTXVB9oH3E4g09ebRRtHSRrMdFDCRY,12060
-hpcflow/sdk/core/element.py,sha256=ksNVQcQX_-IdofAsc4Us3Mw_rEMLO8D5zOM8Cmajaw8,45669
+hpcflow/sdk/core/element.py,sha256=Ea3PHFs4RIAHUPQ_zblt2G0m2e__sH_0q3MnTWCWmW8,45704
 hpcflow/sdk/core/environment.py,sha256=DGUz1NvliKh6opP0IueGHD69rn_8wFLhDsq6kAmEgM4,4849
 hpcflow/sdk/core/errors.py,sha256=AaJWGyKUuHlAAP2LcVIg7D7aw2noL06G4OzP89sUcxU,8712
 hpcflow/sdk/core/json_like.py,sha256=LRZsUd1tn8zXC8fESeiXs7Eko-VdnB8zcXiqixKVcZM,18874
@@ -121,7 +121,7 @@ hpcflow/tests/unit/test_cli.py,sha256=9oQZOlX0z5LC4e2JFLuIgGnUXgmR2RCAtbXR5XRwqJ
 hpcflow/tests/unit/test_command.py,sha256=qf2z0wofxCisza90HMDlb81wsNhByXRAOPMfmRv6paA,22422
 hpcflow/tests/unit/test_config.py,sha256=yW_tCjCaReCud7Lv4-CLt8mZ7XoaGLGxjozJQoZYZ2c,2507
 hpcflow/tests/unit/test_config_file.py,sha256=eB1wJimxk7v4vYtwQ1kwPcExdjcN1q-rdsVOeYHN3dQ,4375
-hpcflow/tests/unit/test_element.py,sha256=8_awZoHkWQi9ImtBqDC0m1BMeggmlDimtOwfjGaSBwg,18583
+hpcflow/tests/unit/test_element.py,sha256=nOfTeXzsF6Pi9PUgP3gYvip3Kj0WkOlh5rLyFSHSu1E,20418
 hpcflow/tests/unit/test_element_iteration.py,sha256=K0oxoDSSKy2JAcAhhE_l63M3u1cus1SsVc5LR2jLe0k,1292
 hpcflow/tests/unit/test_element_set.py,sha256=-aPBcHgubEMvI-lFfKatGm6jZqFfs8zQY9PFAW-Zw9o,2045
 hpcflow/tests/unit/test_input_source.py,sha256=QKAqIpMk-idbSvoWMhjFLroXzBtsWFL4yEG3Frkvq70,20467
@@ -147,7 +147,7 @@ hpcflow/tests/unit/test_workflow_template.py,sha256=EItRqUyXpU2z_z1rvpRqa848YOkX
 hpcflow/tests/workflows/test_jobscript.py,sha256=9sp1o0g72JZbv2QlOl5v7wCZEFjotxiIKGNUxVaFgaA,724
 hpcflow/tests/workflows/test_workflows.py,sha256=xai6FRtGqG4lStJk6KmsqPUSuvqs9FrsBOxMVALshIs,13400
 hpcflow/viz_demo.ipynb,sha256=1QdnVsk72vihv2L6hOGyk318uEa22ZSgGxQCa7hW2oo,6238
-hpcflow_new2-0.2.0a161.dist-info/METADATA,sha256=Fq-m5tYcROogOvrwnQds7tMF1xN_r_fza4kYOoK9O0Q,2473
-hpcflow_new2-0.2.0a161.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
-hpcflow_new2-0.2.0a161.dist-info/entry_points.txt,sha256=aoGtCnFdfPcXfBdu2zZyMOJoz6fPgdR0elqsgrE-USU,106
-hpcflow_new2-0.2.0a161.dist-info/RECORD,,
+hpcflow_new2-0.2.0a162.dist-info/METADATA,sha256=TlloOGkT8R0Pn-Ss1OUHKTVNajM0euAbZ-aJ49zzwKg,2473
+hpcflow_new2-0.2.0a162.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
+hpcflow_new2-0.2.0a162.dist-info/entry_points.txt,sha256=aoGtCnFdfPcXfBdu2zZyMOJoz6fPgdR0elqsgrE-USU,106
+hpcflow_new2-0.2.0a162.dist-info/RECORD,,