hpcflow-new2 0.2.0a228__tar.gz → 0.2.0a230__tar.gz

{hpcflow_new2-0.2.0a228 → hpcflow_new2-0.2.0a230}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: hpcflow-new2
-Version: 0.2.0a228
+Version: 0.2.0a230
 Summary: Computational workflow management
 License: MPL-2.0
 Author: aplowman
@@ -11,6 +11,8 @@ Classifier: Programming Language :: Python :: 3
 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
 Provides-Extra: test
 Requires-Dist: aiohttp (>=3.8.4,<4.0.0)
 Requires-Dist: click (>=8.1.3,<9.0.0)

hpcflow_new2-0.2.0a230/hpcflow/_version.py

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

{hpcflow_new2-0.2.0a228 → hpcflow_new2-0.2.0a230}/hpcflow/sdk/cli.py

@@ -190,7 +190,7 @@ def _make_API_CLI(app: BaseApp):
         format, or a YAML/JSON string.
 
         """
-        wk = app.make_workflow(
+        wk_or_sub = app.make_workflow(
             template_file_or_str=template_file_or_str,
             is_string=string,
             template_format=format,
@@ -204,8 +204,12 @@ def _make_API_CLI(app: BaseApp):
             status=status,
             add_submission=add_submission,
         )
-        assert isinstance(wk, Workflow)
-        click.echo(wk.path)
+        if add_submission:
+            assert isinstance(wk_or_sub, Submission)
+            click.echo(wk_or_sub.workflow.path)
+        else:
+            assert isinstance(wk_or_sub, Workflow)
+            click.echo(wk_or_sub.path)
 
     @click.command(name="go")
     @click.argument("template_file_or_str")

{hpcflow_new2-0.2.0a228 → hpcflow_new2-0.2.0a230}/hpcflow/sdk/demo/cli.py

@@ -29,6 +29,7 @@ from hpcflow.sdk.cli_common import (
     make_status_opt,
     add_sub_opt,
 )
+from hpcflow.sdk.submission.submission import Submission
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
@@ -133,7 +134,7 @@ def get_demo_workflow_CLI(app: BaseApp):
         status: bool = True,
         add_submission: bool = False,
     ):
-        wk = app.make_demo_workflow(
+        wk_or_sub = app.make_demo_workflow(
             workflow_name=workflow_name,
             template_format=format,
             path=path,
@@ -146,8 +147,12 @@ def get_demo_workflow_CLI(app: BaseApp):
             status=status,
             add_submission=add_submission,
         )
-        assert isinstance(wk, Workflow)
-        click.echo(wk.path)
+        if add_submission:
+            assert isinstance(wk_or_sub, Submission)
+            click.echo(wk_or_sub.workflow.path)
+        else:
+            assert isinstance(wk_or_sub, Workflow)
+            click.echo(wk_or_sub.path)
 
     @demo_workflow.command("go")
     @click.argument("workflow_name")

{hpcflow_new2-0.2.0a228 → hpcflow_new2-0.2.0a230}/hpcflow/tests/unit/test_cli.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 import pytest
 
 from click.testing import CliRunner
@@ -143,3 +144,27 @@ def test_cli_click_exit_code_non_zero(tmp_path):
     )
     assert result.exit_code == 2
     assert error_file.is_file()
+
+
+def test_cli_make_demo_workflow(new_null_config, tmp_path):
+    """Check the demo workflow directory is generated."""
+    runner = CliRunner()
+    result = runner.invoke(
+        hf.cli, args=f'demo-workflow make workflow_1 --path "{str(tmp_path)}"'
+    )
+    assert result.exit_code == 0
+    assert Path(result.stdout_bytes.decode().strip()).is_dir()
+
+
+def test_cli_make_demo_workflow_add_sub(new_null_config, tmp_path):
+    """Check the demo workflow directory is generated, and a submission is added."""
+    runner = CliRunner()
+    result = runner.invoke(
+        hf.cli,
+        args=f'demo-workflow make workflow_1 --path "{str(tmp_path)}" --add-submission',
+    )
+    assert result.exit_code == 0
+    wk_path = Path(result.stdout_bytes.decode().strip())
+    assert wk_path.is_dir()
+    wk = hf.Workflow(wk_path)
+    assert len(wk.submissions) == 1

{hpcflow_new2-0.2.0a228 → hpcflow_new2-0.2.0a230}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [tool.poetry]
 name = "hpcflow-new2"
-version = "0.2.0a228"
+version = "0.2.0a230"
 
 description = "Computational workflow management"
 authors = ["aplowman <adam.plowman@manchester.ac.uk>"]
@@ -100,7 +100,7 @@ hook-dirs = "hpcflow.__pyinstaller:get_hook_dirs"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.2.0a228"
+version = "0.2.0a230"
 tag_format = "v$version"
 version_files = [ 
     "pyproject.toml:version",

hpcflow_new2-0.2.0a228/hpcflow/_version.py

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