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

hpcflow/tests/unit/test_slurm.py

@@ -1,37 +1,38 @@
+from __future__ import annotations
 from hpcflow.sdk.submission.schedulers.slurm import SlurmPosix
 
 
-def test_parse_job_ID_simple():
+def test_parse_job_ID_simple() -> None:
     assert SlurmPosix._parse_job_IDs("123") == ("123", None)
 
 
-def test_parse_job_ID_simple_array_item():
+def test_parse_job_ID_simple_array_item() -> None:
     assert SlurmPosix._parse_job_IDs("123_10") == ("123", [9])
 
 
-def test_parse_job_ID_array_simple_range():
+def test_parse_job_ID_array_simple_range() -> None:
     assert SlurmPosix._parse_job_IDs("3397752_[9-11]") == ("3397752", [8, 9, 10])
 
 
-def test_parse_job_ID_array_simple_multiple_range():
+def test_parse_job_ID_array_simple_multiple_range() -> None:
     assert SlurmPosix._parse_job_IDs("49203_[3-5,9-11]") == (
         "49203",
         [2, 3, 4, 8, 9, 10],
     )
 
 
-def test_parse_job_ID_array_simple_mixed_range():
+def test_parse_job_ID_array_simple_mixed_range() -> None:
     assert SlurmPosix._parse_job_IDs("30627658_[5,8-10]") == (
         "30627658",
         [4, 7, 8, 9],
     )
 
 
-def test_parse_job_ID_array_simple_range_with_max_concurrent():
+def test_parse_job_ID_array_simple_range_with_max_concurrent() -> None:
     assert SlurmPosix._parse_job_IDs("3397752_[9-11%2]") == ("3397752", [8, 9, 10])
 
 
-def test_parse_job_ID_array_simple_multiple_range_max_concurrent():
+def test_parse_job_ID_array_simple_multiple_range_max_concurrent() -> None:
     assert SlurmPosix._parse_job_IDs("49203_[3-5%1,9-11%2]") == (
         "49203",
         [2, 3, 4, 8, 9, 10],

hpcflow/tests/unit/test_submission.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
 from datetime import timedelta
-
+from typing import Any
+from typing_extensions import TypedDict
 import pytest
 
 from hpcflow.app import app as hf
@@ -8,8 +10,8 @@ from hpcflow.sdk.core.errors import (
     MissingEnvironmentExecutableError,
     MissingEnvironmentExecutableInstanceError,
 )
+from hpcflow.sdk.core.utils import timedelta_format, timedelta_parse
 from hpcflow.sdk.submission.jobscript import group_resource_map_into_jobscripts
-from hpcflow.sdk.submission.submission import timedelta_format, timedelta_parse
 
 
 @pytest.fixture
@@ -18,9 +20,14 @@ def null_config(tmp_path):
         hf.load_config(config_dir=tmp_path)
 
 
-def test_group_resource_map_into_jobscripts(null_config):
+class _Example(TypedDict):
+    resources: list[list[int]]
+    expected: list[dict[str, Any]]
+
+
+def test_group_resource_map_into_jobscripts(null_config) -> None:
     # x-axis corresponds to elements; y-axis corresponds to actions:
-    examples = (
+    examples: tuple[_Example, ...] = (
         {
             "resources": [
                 [1, 1, 1, 2, -1, 2, 4, -1, 1],
@@ -178,13 +185,13 @@ def test_group_resource_map_into_jobscripts(null_config):
         assert jobscripts_i == i["expected"]
 
 
-def test_timedelta_parse_format_round_trip(null_config):
+def test_timedelta_parse_format_round_trip(null_config) -> None:
     td = timedelta(days=2, hours=25, minutes=92, seconds=77)
     td_str = timedelta_format(td)
     assert td_str == timedelta_format(timedelta_parse(td_str))
 
 
-def test_raise_missing_env_executable(new_null_config, tmp_path):
+def test_raise_missing_env_executable(new_null_config, tmp_path) -> None:
     exec_name = (
         "my_executable"  # null_env (the default) has no executable "my_executable"
     )
@@ -202,7 +209,7 @@ def test_raise_missing_env_executable(new_null_config, tmp_path):
         wk.add_submission()
 
 
-def test_raise_missing_matching_env_executable(new_null_config, tmp_path):
+def test_raise_missing_matching_env_executable(new_null_config, tmp_path) -> None:
     """The executable label exists, but no a matching instance."""
     env_name = "my_hpcflow_env"
     exec_label = "my_exec_name"
@@ -241,7 +248,7 @@ def test_raise_missing_matching_env_executable(new_null_config, tmp_path):
         wk.add_submission()
 
 
-def test_no_raise_matching_env_executable(new_null_config, tmp_path):
+def test_no_raise_matching_env_executable(new_null_config, tmp_path) -> None:
     env_name = "my_hpcflow_env"
     exec_label = "my_exec_name"
     env = hf.Environment(
@@ -278,7 +285,7 @@ def test_no_raise_matching_env_executable(new_null_config, tmp_path):
     wk.add_submission()
 
 
-def test_raise_missing_env(new_null_config, tmp_path):
+def test_raise_missing_env(new_null_config, tmp_path) -> None:
     env_name = "my_hpcflow_env"
     ts = hf.TaskSchema(
         objective="test_sub",
@@ -294,7 +301,7 @@ def test_raise_missing_env(new_null_config, tmp_path):
         wk.add_submission()
 
 
-def test_custom_env_and_executable(new_null_config, tmp_path):
+def test_custom_env_and_executable(new_null_config, tmp_path) -> None:
     env_name = "my_hpcflow_env"
     exec_label = "my_exec_name"
     env = hf.Environment(
@@ -330,7 +337,7 @@ def test_custom_env_and_executable(new_null_config, tmp_path):
     wk.add_submission()
 
 
-def test_abort_EARs_file_creation(null_config, tmp_path):
+def test_abort_EARs_file_creation(null_config, tmp_path) -> None:
     wk_name = "temp"
     t1 = hf.Task(
         schema=hf.task_schemas.test_t1_conditional_OS,
@@ -342,6 +349,7 @@ def test_abort_EARs_file_creation(null_config, tmp_path):
         path=tmp_path,
     )
     sub = wk.add_submission()
+    assert sub is not None
     wk.submissions_path.mkdir(exist_ok=True, parents=True)
     sub.path.mkdir(exist_ok=True)
     sub._write_abort_EARs_file()
@@ -352,7 +360,7 @@ def test_abort_EARs_file_creation(null_config, tmp_path):
 
 
 @pytest.mark.parametrize("run_id", [0, 1, 2])
-def test_abort_EARs_file_update(null_config, tmp_path, run_id):
+def test_abort_EARs_file_update(null_config, tmp_path, run_id) -> None:
     wk_name = "temp"
     t1 = hf.Task(
         schema=hf.task_schemas.test_t1_conditional_OS,
@@ -364,6 +372,7 @@ def test_abort_EARs_file_update(null_config, tmp_path, run_id):
         path=tmp_path,
     )
     sub = wk.add_submission()
+    assert sub is not None
     wk.submissions_path.mkdir(exist_ok=True, parents=True)
     sub.path.mkdir(exist_ok=True)
     sub._write_abort_EARs_file()
@@ -378,7 +387,7 @@ def test_abort_EARs_file_update(null_config, tmp_path, run_id):
     assert lines == "\n".join(lines_exp) + "\n"
 
 
-def test_abort_EARs_file_update_with_existing_abort(null_config, tmp_path):
+def test_abort_EARs_file_update_with_existing_abort(null_config, tmp_path) -> None:
     wk_name = "temp"
     t1 = hf.Task(
         schema=hf.task_schemas.test_t1_conditional_OS,
@@ -390,6 +399,7 @@ def test_abort_EARs_file_update_with_existing_abort(null_config, tmp_path):
         path=tmp_path,
     )
     sub = wk.add_submission()
+    assert sub is not None
     wk.submissions_path.mkdir(exist_ok=True, parents=True)
     sub.path.mkdir(exist_ok=True)
     sub._write_abort_EARs_file()
@@ -404,7 +414,7 @@ def test_abort_EARs_file_update_with_existing_abort(null_config, tmp_path):
     assert lines == "\n".join(lines_exp) + "\n"
 
 
-def test_unique_schedulers_one_direct(new_null_config, tmp_path):
+def test_unique_schedulers_one_direct(new_null_config, tmp_path) -> None:
     t1 = hf.Task(
         schema=hf.task_schemas.test_t1_conditional_OS,
         inputs={"p1": 1},
@@ -419,12 +429,15 @@ def test_unique_schedulers_one_direct(new_null_config, tmp_path):
         path=tmp_path,
     )
     sub = wk.add_submission()
+    assert sub is not None
     scheds = sub.get_unique_schedulers()
 
     assert len(scheds) == 1
 
 
-def test_unique_schedulers_one_direct_distinct_resources(new_null_config, tmp_path):
+def test_unique_schedulers_one_direct_distinct_resources(
+    new_null_config, tmp_path
+) -> None:
     t1 = hf.Task(
         schema=hf.task_schemas.test_t1_conditional_OS,
         inputs={"p1": 1},
@@ -441,13 +454,14 @@ def test_unique_schedulers_one_direct_distinct_resources(new_null_config, tmp_pa
         path=tmp_path,
     )
     sub = wk.add_submission()
+    assert sub is not None
     scheds = sub.get_unique_schedulers()
 
     assert len(scheds) == 1
 
 
 @pytest.mark.slurm
-def test_unique_schedulers_one_SLURM(new_null_config, tmp_path):
+def test_unique_schedulers_one_SLURM(new_null_config, tmp_path) -> None:
     hf.config.add_scheduler("slurm")
     t1 = hf.Task(
         schema=hf.task_schemas.test_t1_conditional_OS,
@@ -465,13 +479,16 @@ def test_unique_schedulers_one_SLURM(new_null_config, tmp_path):
         path=tmp_path,
     )
     sub = wk.add_submission()
+    assert sub is not None
     scheds = sub.get_unique_schedulers()
 
     assert len(scheds) == 1
 
 
 @pytest.mark.slurm
-def test_unique_schedulers_one_SLURM_distinct_resources(new_null_config, tmp_path):
+def test_unique_schedulers_one_SLURM_distinct_resources(
+    new_null_config, tmp_path
+) -> None:
     hf.config.add_scheduler("slurm")
     t1 = hf.Task(
         schema=hf.task_schemas.test_t1_conditional_OS,
@@ -489,13 +506,14 @@ def test_unique_schedulers_one_SLURM_distinct_resources(new_null_config, tmp_pat
         path=tmp_path,
     )
     sub = wk.add_submission()
+    assert sub is not None
     scheds = sub.get_unique_schedulers()
 
     assert len(scheds) == 1
 
 
 @pytest.mark.slurm
-def test_unique_schedulers_two_direct_and_SLURM(new_null_config, tmp_path):
+def test_unique_schedulers_two_direct_and_SLURM(new_null_config, tmp_path) -> None:
     hf.config.add_scheduler("slurm")
     t1 = hf.Task(
         schema=hf.task_schemas.test_t1_conditional_OS,
@@ -513,12 +531,13 @@ def test_unique_schedulers_two_direct_and_SLURM(new_null_config, tmp_path):
         path=tmp_path,
     )
     sub = wk.add_submission()
+    assert sub is not None
     scheds = sub.get_unique_schedulers()
 
     assert len(scheds) == 2
 
 
-def test_scheduler_config_defaults(new_null_config, tmp_path):
+def test_scheduler_config_defaults(new_null_config, tmp_path) -> None:
     """Check default options defined in the config are merged into jobscript resources."""
     hf.config.set("schedulers.direct.defaults.options", {"a": "c"})
 
@@ -540,5 +559,6 @@ def test_scheduler_config_defaults(new_null_config, tmp_path):
         path=tmp_path,
     )
     sub = wk.add_submission()
+    assert sub is not None
     assert sub.jobscripts[0].resources.scheduler_args == {"options": {"a": "c"}}
     assert sub.jobscripts[1].resources.scheduler_args == {"options": {"a": "b"}}