hpcflow-new2 0.2.0a186__tar.gz → 0.2.0a188__tar.gz

{hpcflow_new2-0.2.0a186 → hpcflow_new2-0.2.0a188}/PKG-INFO

@@ -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.0a188/hpcflow/_version.py

@@ -0,0 +1 @@
+__version__ = "0.2.0a188"

{hpcflow_new2-0.2.0a186 → hpcflow_new2-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_new2-0.2.0a186 → hpcflow_new2-0.2.0a188}/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_new2-0.2.0a186 → hpcflow_new2-0.2.0a188}/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 → hpcflow_new2-0.2.0a188}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [tool.poetry]
 name = "hpcflow-new2"
-version = "0.2.0a186"
+version = "0.2.0a188"
 
 description = "Computational workflow management"
 authors = ["aplowman <adam.plowman@manchester.ac.uk>"]
@@ -13,15 +13,9 @@ packages = [
 exclude = ["hpcflow/data/demo_data"]
 
 [tool.poetry.dependencies]
-python = ">=3.8,<3.13"
-zarr = [
-    {version = "^2.16.1", python = "<3.9"},
-    {version = "2.17.2", python = ">=3.9"}
-]
-numpy = [
-    {version = "^1.24.4", python = "<3.9"},
-    {version = "^1.26.4", python = ">=3.9"},
-]
+python = ">=3.9,<3.13"
+zarr = "^2.17.2"
+numpy = "^1.26.4"
 ruamel-yaml = "^0.18.6"
 colorama = "^0.4.6"
 termcolor = "^1.1.0"
@@ -76,7 +70,7 @@ hook-dirs = "hpcflow.__pyinstaller:get_hook_dirs"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.2.0a186"
+version = "0.2.0a188"
 tag_format = "v$version"
 version_files = [ 
     "pyproject.toml:version",

hpcflow_new2-0.2.0a186/hpcflow/_version.py

@@ -1 +0,0 @@
-__version__ = "0.2.0a186"