runem 0.0.11__py3-none-any.whl → 0.0.13__py3-none-any.whl

runem/run_command.py

@@ -16,19 +16,18 @@ def get_stdout(process: subprocess.CompletedProcess, prefix: str) -> str:
 
 
 def run_command(  # noqa: C901 # pylint: disable=too-many-branches
+    cmd: typing.List[str],  # 'cmd' is the only thing that can't be optionally kwargs
     label: str,
-    cmd: typing.List[str],
     verbose: bool,
     env_overrides: typing.Optional[dict] = None,
     ignore_fails: bool = False,
     valid_exit_ids: typing.Optional[typing.Tuple[int, ...]] = None,
+    **kwargs: typing.Any,
 ) -> str:
     """Runs the given command, returning stdout or throwing on any error."""
     cmd_string: str = " ".join(cmd)
     if verbose:
-        print("runem: test: " + "=" * TERMINAL_WIDTH)
-        print(f"runem: test: {label}")
-        print(f"{cmd_string}")
+        print(f"runem: running: start: {label}: {cmd_string}")
         if valid_exit_ids is not None:
             valid_exit_strs = ",".join([str(exit_code) for exit_code in valid_exit_ids])
             print(f"allowed return ids are: {valid_exit_strs}")
@@ -68,9 +67,6 @@ def run_command(  # noqa: C901 # pylint: disable=too-many-branches
     if run_env:
         run_env_param = run_env
 
-    if verbose:
-        print("runem: test: " + "=" * TERMINAL_WIDTH)
-
     process: subprocess.CompletedProcess
     try:
         process = subprocess.run(
@@ -110,5 +106,5 @@ def run_command(  # noqa: C901 # pylint: disable=too-many-branches
     cmd_stdout: str = get_stdout(process, prefix=label)
     if verbose:
         print(cmd_stdout)
-
+        print(f"runem: running: done: {label}: {cmd_string}")
     return cmd_stdout

runem/runem.py

@@ -630,11 +630,12 @@ def _run_job(
         function(args, options, file_list)
     else:
         function(
-            options,  # type: ignore
-            file_list,  # type: ignore
+            options=options,  # type: ignore
+            file_list=file_list,  # type: ignore
             procs=args.procs,
             root_path=root_path,
             verbose=args.verbose,
+            **job_config,
         )
     end = timer()
     time_taken: timedelta = timedelta(seconds=end - start)
@@ -644,7 +645,7 @@ def _run_job(
 
 
 def _get_test_function(
-    cfg_filepath: typing.Optional[pathlib.Path],
+    cfg_filepath: pathlib.Path,
     module_name: str,
     module_file_path: pathlib.Path,
     function_to_load: str,
@@ -664,7 +665,16 @@ def _get_test_function(
     if not module_spec.loader:
         raise FunctionNotFound("unable to load module")
     module_spec.loader.exec_module(module)
-    function: JobFunction = getattr(module, function_to_load)
+    try:
+        function: JobFunction = getattr(module, function_to_load)
+    except AttributeError as err:
+        raise FunctionNotFound(
+            (
+                f"ERROR! Check that function '{function_to_load}' "
+                f"exists in '{module_file_path}' as expected in "
+                f"your config at '{str(cfg_filepath)}"
+            )
+        ) from err
     return function
 
 
@@ -696,9 +706,19 @@ def get_test_function(job_config: JobConfig, cfg_filepath: pathlib.Path) -> JobF
     Also re-address the job-config.
     """
     function_to_load: str = job_config["addr"]["function"]
-    module_file_path: pathlib.Path = _find_job_module(
-        cfg_filepath, job_config["addr"]["file"]
-    )
+    try:
+        module_file_path: pathlib.Path = _find_job_module(
+            cfg_filepath, job_config["addr"]["file"]
+        )
+    except FunctionNotFound as err:
+        raise FunctionNotFound(
+            (
+                f"Whilst loading job '{job_config['label']}' runem failed to find "
+                f"job.addr.file '{job_config['addr']['file']}' looking for "
+                f"job.addr.function '{function_to_load}'"
+            )
+        ) from err
+
     module_name = module_file_path.stem.replace(" ", "_").replace("-", "_")
 
     try:
@@ -856,10 +876,17 @@ def _parse_job_config(
     Returns the tags generated
     """
     try:
+        job_names_used = job["label"] in in_out_job_names
+        if job_names_used:
+            print("ERROR: duplicate job label!")
+            print(f"\t'{job['label']}' is used twice or more in {str(cfg_filepath)}")
+            sys.exit(1)
+
         # try and load the function _before_ we schedule it's execution
         get_test_function(job, cfg_filepath)
         phase_id: PhaseName = job["when"]["phase"]
         in_out_jobs_by_phase[phase_id].append(job)
+
         in_out_job_names.add(job["label"])
         in_out_phases.add(job["when"]["phase"])
         for tag in job["when"]["tags"]:

{runem-0.0.11.dist-info → runem-0.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: runem
-Version: 0.0.11
+Version: 0.0.13
 Summary: Awesome runem created by lursight
 Home-page: https://github.com/lursight/runem/
 Author: lursight

runem-0.0.13.dist-info/RECORD

@@ -0,0 +1,14 @@
+runem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+runem/__main__.py,sha256=dsOiVZegpfK9JOs5n7UmbX5iwwbj7iFkEbLoVeEgAn4,136
+runem/base.py,sha256=EZfR7FIlwEdU9Vfe47Wk2DOO8GQqpKxxLNKp6YHueZ4,316
+runem/cli.py,sha256=YFwon1P7uSpAYNuJxe2f0wo0HpI3OYTQ-UBWx6xU1iY,145
+runem/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+runem/run_command.py,sha256=eYArn2gwPOTHID2040NxLoaM7yrvPnaWgWvPreRhrm0,3685
+runem/runem.py,sha256=AXBSnTse_TBWf0dOEyAVOGOrpbCrr3yy0Dgt6b-b-fQ,35796
+scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+runem-0.0.13.dist-info/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
+runem-0.0.13.dist-info/METADATA,sha256=JE1cGOxKcT39PiEPm2UtHxB9LG9ROTaXfB1CArcnKgY,15909
+runem-0.0.13.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+runem-0.0.13.dist-info/entry_points.txt,sha256=nu0g_vBeuPihYtimbtlNusxWovylMppvJ8UxdJlJfvM,46
+runem-0.0.13.dist-info/top_level.txt,sha256=rd8MZEjuPdjwXuLZlbdZEg8_WGxrY1c8M36uHjNjbNk,14
+runem-0.0.13.dist-info/RECORD,,

runem-0.0.11.dist-info/RECORD

@@ -1,14 +0,0 @@
-runem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-runem/__main__.py,sha256=dsOiVZegpfK9JOs5n7UmbX5iwwbj7iFkEbLoVeEgAn4,136
-runem/base.py,sha256=EZfR7FIlwEdU9Vfe47Wk2DOO8GQqpKxxLNKp6YHueZ4,316
-runem/cli.py,sha256=YFwon1P7uSpAYNuJxe2f0wo0HpI3OYTQ-UBWx6xU1iY,145
-runem/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-runem/run_command.py,sha256=SWFUxCwjkpeFjds9G7spR4Zu_DHDCAGHYPLaH5a5qWs,3671
-runem/runem.py,sha256=yTmL8fUMh70gLMAYDlFU-KV2lp8kZM9r3Huo8sCeu8E,34852
-scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-runem-0.0.11.dist-info/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
-runem-0.0.11.dist-info/METADATA,sha256=r-hsbTKM7Swzuy2_hSCnT86htXew084ZNRmwnkU-7w4,15909
-runem-0.0.11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-runem-0.0.11.dist-info/entry_points.txt,sha256=nu0g_vBeuPihYtimbtlNusxWovylMppvJ8UxdJlJfvM,46
-runem-0.0.11.dist-info/top_level.txt,sha256=rd8MZEjuPdjwXuLZlbdZEg8_WGxrY1c8M36uHjNjbNk,14
-runem-0.0.11.dist-info/RECORD,,