From ca382da0781755e997ffd2673c53be4840b766c2 Mon Sep 17 00:00:00 2001 From: Hilary James Oliver Date: Mon, 14 Aug 2023 14:09:48 +1200 Subject: [PATCH] Type hints, tweaks. --- cylc/flow/id_match.py | 2 +- cylc/flow/scripts/reset.py | 8 +++++--- cylc/flow/task_events_mgr.py | 3 --- cylc/flow/task_pool.py | 2 +- tests/unit/test_id_match.py | 1 - 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/cylc/flow/id_match.py b/cylc/flow/id_match.py index 846c2ea3ebf..1e148ea18a4 100644 --- a/cylc/flow/id_match.py +++ b/cylc/flow/id_match.py @@ -76,7 +76,7 @@ def filter_ids( - pool: 'List[Pool]', + pool: 'Pool', ids: 'Iterable[str]', *, warn: 'bool' = True, diff --git a/cylc/flow/scripts/reset.py b/cylc/flow/scripts/reset.py index 91feb8853c8..a81bfbc9afd 100755 --- a/cylc/flow/scripts/reset.py +++ b/cylc/flow/scripts/reset.py @@ -39,6 +39,7 @@ from functools import partial from optparse import Values from json import dumps +from typing import Dict from cylc.flow.exceptions import InputError from cylc.flow.network.client_factory import get_client @@ -56,6 +57,7 @@ from cylc.flow.scripts.show import prereqs_and_outputs_query + MUTATION = ''' mutation ( $wFlows: [WorkflowID]!, @@ -165,11 +167,11 @@ async def run(options: 'Values', workflow_id: str, *tokens_list) -> None: # Print `cylc show` info as feedback to user. # TODO: do this FIRST; the mutation may not (won't?) be done in time. opts = Values() - json_filter = {} + json_filter: Dict = {} opts.json = False opts.list_prereqs = False - ret = await prereqs_and_outputs_query( + result = await prereqs_and_outputs_query( workflow_id, tokens_list, pclient, @@ -179,7 +181,7 @@ async def run(options: 'Values', workflow_id: str, *tokens_list) -> None: if opts.json: print(dumps(json_filter, indent=4)) else: - print(ret) + print(result) @cli_function(get_option_parser) diff --git a/cylc/flow/task_events_mgr.py b/cylc/flow/task_events_mgr.py index 72aaffa31c1..46d46aae942 100644 --- a/cylc/flow/task_events_mgr.py +++ b/cylc/flow/task_events_mgr.py @@ -1651,9 +1651,6 @@ def reset_bad_hosts(self): def spawn_children(self, itask, output): # update DB task outputs - print(f">>>>>>>>>>>>>>>>>>>>>>. {itask}, {output}") self.workflow_db_mgr.put_update_task_outputs(itask) - self.workflow_db_mgr.process_queued_ops() - # spawn child-tasks self.spawn_func(itask, output) diff --git a/cylc/flow/task_pool.py b/cylc/flow/task_pool.py index 8fd94f1654d..d4dd94959cf 100644 --- a/cylc/flow/task_pool.py +++ b/cylc/flow/task_pool.py @@ -1485,7 +1485,7 @@ def spawn_task( name, point ) ) - return False + return None itask = TaskProxy( self.tokens, diff --git a/tests/unit/test_id_match.py b/tests/unit/test_id_match.py index f68c1458dd1..3fda5527f24 100644 --- a/tests/unit/test_id_match.py +++ b/tests/unit/test_id_match.py @@ -60,7 +60,6 @@ def _task_pool(pool, hier) -> 'Pool': } set_cycling_type(CYCLER_TYPE_INTEGER) - print(_task_pool, '<<<<<<<') return _task_pool