hpcflow-new2 0.2.0a186__py3-none-any.whl → 0.2.0a188__py3-none-any.whl

hpcflow/_version.py

@@ -1 +1 @@
-__version__ = "0.2.0a186"
+__version__ = "0.2.0a188"

hpcflow/sdk/app.py

@@ -481,11 +481,7 @@ class BaseApp(metaclass=Singleton):
         components = {}
         for comp_type in TEMPLATE_COMP_TYPES:
             resource = f"{comp_type}.yaml"
-            try:
-                fh = resources.files(package).joinpath(resource).open("rt")
-            except AttributeError:
-                # < python 3.9; `resource.open_text` deprecated since 3.11
-                fh = resources.open_text(package, resource)
+            fh = resources.files(package).joinpath(resource).open("rt")
             SDK_logger.info(f"Parsing file as YAML: {fh.name!r}")
             comp_dat = fh.read()
             components[comp_type] = read_YAML_str(comp_dat)
@@ -905,11 +901,7 @@ class BaseApp(metaclass=Singleton):
         # TODO: load custom directories / custom functions (via decorator)
         scripts_package = f"{self.package_name}.{self.scripts_dir}"
 
-        try:
-            ctx = resources.as_file(resources.files(scripts_package))
-        except AttributeError:
-            # < python 3.9; `resource.path` deprecated since 3.11
-            ctx = resources.path(scripts_package, "")
+        ctx = resources.as_file(resources.files(scripts_package))
 
         scripts = {}
         with ctx as path:
@@ -930,11 +922,7 @@ class BaseApp(metaclass=Singleton):
         """Get all builtin demo workflow template file paths."""
         templates = {}
         pkg = f"{self.package_name}.{self.workflows_dir}"
-        try:
-            files = resources.files(pkg).iterdir()
-        except AttributeError:
-            # python 3.8; `resources.contents` deprecated since 3.11
-            files = resources.contents(pkg)
+        files = resources.files(pkg).iterdir()
         for i in files:
             if i.suffix in (".yaml", ".yml", ".json", ".jsonc"):
                 templates[i.stem] = i
@@ -1778,11 +1766,7 @@ class BaseApp(metaclass=Singleton):
         test_args = (self.pytest_args or []) + list(args)
         pkg = self.package_name
         tests_dir = "tests"
-        try:
-            ctx_man = resources.as_file(resources.files(pkg).joinpath(tests_dir))
-        except AttributeError:
-            # < Python 3.9
-            ctx_man = resources.path(pkg, tests_dir)
+        ctx_man = resources.as_file(resources.files(pkg).joinpath(tests_dir))
         with ctx_man as test_dir:
             return pytest.main([str(test_dir)] + test_args)
 
@@ -2473,11 +2457,7 @@ class BaseApp(metaclass=Singleton):
             )
             package = self.demo_data_manifest_dir
             resource = "demo_data_manifest.json"
-            try:
-                fh = resources.files(package).joinpath(resource).open("rt")
-            except AttributeError:
-                # < python 3.9; `resource.open_text` deprecated since 3.11
-                fh = resources.open_text(package, resource)
+            fh = resources.files(package).joinpath(resource).open("rt")
             manifest = json.load(fh)
             fh.close()
         return manifest
@@ -2561,12 +2541,6 @@ class BaseApp(metaclass=Singleton):
             try:
                 ctx_man = resources.as_file(resources.files(package).joinpath(src_fn))
                 # raises ModuleNotFoundError
-            except AttributeError:
-                # < python 3.9
-                try:
-                    ctx_man = resources.path(package, src_fn)
-                except ModuleNotFoundError:
-                    resource_exists = False
             except ModuleNotFoundError:
                 resource_exists = False
 

hpcflow/sdk/core/test_utils.py

@@ -193,30 +193,26 @@ def make_workflow(
     return wk
 
 
-def make_test_data_YAML_workflow(workflow_name, path, **kwargs):
+def make_test_data_YAML_workflow(
+    workflow_name, path, app=None, pkg="hpcflow.tests.data", **kwargs
+):
     """Generate a workflow whose template file is defined in the test data directory."""
-    pkg = "hpcflow.tests.data"
-    try:
-        script_ctx = resources.as_file(resources.files(pkg).joinpath(workflow_name))
-    except AttributeError:
-        # < python 3.9; `resource.path` deprecated since 3.11
-        script_ctx = resources.path(pkg, workflow_name)
+    app = hf if app is None else app
+    script_ctx = resources.as_file(resources.files(pkg).joinpath(workflow_name))
 
     with script_ctx as file_path:
-        return hf.Workflow.from_YAML_file(YAML_path=file_path, path=path, **kwargs)
+        return app.Workflow.from_YAML_file(YAML_path=file_path, path=path, **kwargs)
 
 
-def make_test_data_YAML_workflow_template(workflow_name, **kwargs):
+def make_test_data_YAML_workflow_template(
+    workflow_name, app=None, pkg="hpcflow.tests.data", **kwargs
+):
     """Generate a workflow template whose file is defined in the test data directory."""
-    pkg = "hpcflow.tests.data"
-    try:
-        script_ctx = resources.as_file(resources.files(pkg).joinpath(workflow_name))
-    except AttributeError:
-        # < python 3.9; `resource.path` deprecated since 3.11
-        script_ctx = resources.path(pkg, workflow_name)
+    app = hf if app is None else app
+    script_ctx = resources.as_file(resources.files(pkg).joinpath(workflow_name))
 
     with script_ctx as file_path:
-        return hf.WorkflowTemplate.from_file(path=file_path, **kwargs)
+        return app.WorkflowTemplate.from_file(path=file_path, **kwargs)
 
 
 @dataclass

hpcflow/sdk/core/validation.py

@@ -18,11 +18,7 @@ def get_schema(filename):
         (:py:mod:`hpcflow.sdk.data`).
     """
     package = "hpcflow.sdk.data"
-    try:
-        fh = resources.files(package).joinpath(filename).open("rt")
-    except AttributeError:
-        # < python 3.9; `resource.open_text` deprecated since 3.11
-        fh = resources.open_text(package, filename)
+    fh = resources.files(package).joinpath(filename).open("rt")
     schema_dat = fh.read()
     fh.close()
     schema = Schema.from_yaml(schema_dat)

{hpcflow_new2-0.2.0a186.dist-info → hpcflow_new2-0.2.0a188.dist-info}/METADATA

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: hpcflow-new2
-Version: 0.2.0a186
+Version: 0.2.0a188
 Summary: Computational workflow management
 License: MIT
 Author: aplowman
 Author-email: adam.plowman@manchester.ac.uk
-Requires-Python: >=3.8,<3.13
+Requires-Python: >=3.9,<3.13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -19,8 +18,7 @@ Requires-Dist: colorama (>=0.4.6,<0.5.0)
 Requires-Dist: fsspec (>=2022.2.0,<2023.0.0)
 Requires-Dist: h5py (>=3.9.0,<4.0.0)
 Requires-Dist: msgpack (>=1.0.4,<2.0.0)
-Requires-Dist: numpy (>=1.24.4,<2.0.0) ; python_version < "3.9"
-Requires-Dist: numpy (>=1.26.4,<2.0.0) ; python_version >= "3.9"
+Requires-Dist: numpy (>=1.26.4,<2.0.0)
 Requires-Dist: paramiko (>=3.2.0,<4.0.0)
 Requires-Dist: platformdirs (>=4.2.1,<5.0.0)
 Requires-Dist: psutil (>=5.9.4,<6.0.0)
@@ -32,8 +30,7 @@ Requires-Dist: ruamel-yaml (>=0.18.6,<0.19.0)
 Requires-Dist: termcolor (>=1.1.0,<2.0.0)
 Requires-Dist: valida (>=0.7.5,<0.8.0)
 Requires-Dist: watchdog (>=2.1.9,<3.0.0)
-Requires-Dist: zarr (==2.17.2) ; python_version >= "3.9"
-Requires-Dist: zarr (>=2.16.1,<3.0.0) ; python_version < "3.9"
+Requires-Dist: zarr (>=2.17.2,<3.0.0)
 Description-Content-Type: text/markdown
 
 <div align="center">

{hpcflow_new2-0.2.0a186.dist-info → hpcflow_new2-0.2.0a188.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=sJkU41hH7ZR8N7Wo3VRZhspndULQ0OhTLlLwedaZzE0,26
+hpcflow/_version.py,sha256=XYYOD4slAoYEv4hijR18gRSw9NN2hA72hrVGVHXJkLE,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=Hsq0jT8EXM13wu1MpGy5FQgyuz56ygep4VWOnulFn50,41
@@ -35,7 +35,7 @@ hpcflow/data/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 hpcflow/data/workflows/workflow_1.yaml,sha256=lF7Re2SVc_5gQk5AwB0gXaq-n-T5ia4su3zNQ9oMRV0,220
 hpcflow/examples.ipynb,sha256=cLKp4QsxwwMXRanDnfWY9kqsV23q6G4raOpu6IZXnMw,28553
 hpcflow/sdk/__init__.py,sha256=5DGawWK-NhDA_pYL_NRr4AL8Zk17Ra7Yk_4LuCaUUEU,5785
-hpcflow/sdk/app.py,sha256=k3QHqVmLHKe0Q_-kjjdmB4zfmMHdHB2ZH_jFCXW2JeY,100626
+hpcflow/sdk/app.py,sha256=BbpyVdBKdzG3Xwk2J5xSDkoh6iFdShTJ9gu4WNuDSMc,99550
 hpcflow/sdk/cli.py,sha256=h3igMZAjfvQvmF0uKTKLYClPnRxTONIyiv6Cjr0rllo,38015
 hpcflow/sdk/cli_common.py,sha256=F5IXERXVRTlIwjrqYgYeNKLhK9MjpOnv6aAc_xIyIo0,7199
 hpcflow/sdk/config/__init__.py,sha256=7WUK7nb7UW64ZUDzaHa39BFAWWIfGRfgEPjSPxWjgWA,119
@@ -62,9 +62,9 @@ hpcflow/sdk/core/rule.py,sha256=cWpGaBiYsRHKeaG1XfbI_Rgwhpz6rfM-sQ1nUeTKKhA,5625
 hpcflow/sdk/core/run_dir_files.py,sha256=wtgWuvtWuNFo5YG5v1k3EBvYQFqGkr27mv4NqMlp4lQ,2410
 hpcflow/sdk/core/task.py,sha256=zwGW-YewQIh9JSDDV5mrm7epPFT0SRT7ofpI2HUh6RM,131822
 hpcflow/sdk/core/task_schema.py,sha256=uuV8_2iEZ2Q-0ZMnkdgbUsR6b7KOLrGFG69QD7zE9wQ,34717
-hpcflow/sdk/core/test_utils.py,sha256=vkpZesJNFNfBxjIDDr_WKIxFx2tUkde_kPn6eDjtwxs,10303
+hpcflow/sdk/core/test_utils.py,sha256=9v0Bom2R16wj-ZNSY8Q__wsZO3nVuiBfnSG1fXKTDSw,10085
 hpcflow/sdk/core/utils.py,sha256=9PHfwfUyREJTSQYlCbRbKHwrx1SA6c7Uh_TFrg9xynQ,28591
-hpcflow/sdk/core/validation.py,sha256=jWBJiHOv2_pL-Dua9dpsd6Qc2KmDZOQeVhFri4vMn6U,704
+hpcflow/sdk/core/validation.py,sha256=2Fxo3MldIcftwVUKs07ZeSlfTSRqFnq9J6T9327ukHI,545
 hpcflow/sdk/core/workflow.py,sha256=nd_NWNPZUgpc4GvX5Ivy1oF__Dj2Q_kIAfvQbBohXjs,120067
 hpcflow/sdk/core/zarr_io.py,sha256=RgJia3jgE3Y16ERU4nWNzHNDkK-qDS1znZMB1IfOUd4,6182
 hpcflow/sdk/data/__init__.py,sha256=-YzROirohSKU2UGYj5vkCe_J2KejbzhIjUXNaJwKHLk,568
@@ -151,8 +151,8 @@ hpcflow/tests/unit/test_workflow_template.py,sha256=fF7LNveMwCledgncNCRfD9Nd9dL9
 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.0a186.dist-info/LICENSE,sha256=Xhxf_KsrJNJFGMogumZhXSTPhUOVHCWf7nU-TDzqg0E,16763
-hpcflow_new2-0.2.0a186.dist-info/METADATA,sha256=EXxdKVjcIvnVtzxtat-tDl17UIjjidUhsvhCiu0Vipg,2465
-hpcflow_new2-0.2.0a186.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
-hpcflow_new2-0.2.0a186.dist-info/entry_points.txt,sha256=aoGtCnFdfPcXfBdu2zZyMOJoz6fPgdR0elqsgrE-USU,106
-hpcflow_new2-0.2.0a186.dist-info/RECORD,,
+hpcflow_new2-0.2.0a188.dist-info/LICENSE,sha256=Xhxf_KsrJNJFGMogumZhXSTPhUOVHCWf7nU-TDzqg0E,16763
+hpcflow_new2-0.2.0a188.dist-info/METADATA,sha256=4r0GLNdUp2dxLl8EtHecYltzm4ZV38GDljiiOUeiir0,2243
+hpcflow_new2-0.2.0a188.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
+hpcflow_new2-0.2.0a188.dist-info/entry_points.txt,sha256=aoGtCnFdfPcXfBdu2zZyMOJoz6fPgdR0elqsgrE-USU,106
+hpcflow_new2-0.2.0a188.dist-info/RECORD,,