From e9b3547a2fe1fc6ef951502b4f9cfccb13db506f Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 15 Jan 2024 15:58:34 +0000 Subject: [PATCH] fix mistake in earlier error message --- cylc/flow/cfgspec/workflow.py | 3 +-- tests/functional/deprecations/01-cylc8-basic/validation.stderr | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cylc/flow/cfgspec/workflow.py b/cylc/flow/cfgspec/workflow.py index e939724e933..8476df36170 100644 --- a/cylc/flow/cfgspec/workflow.py +++ b/cylc/flow/cfgspec/workflow.py @@ -1989,10 +1989,9 @@ def upgrade_graph_section(cfg: Dict[str, Any], descr: str) -> None: list_cp = False else: msg_old = '[scheduling][dependencies][X]graph' - msg_new = '[scheduling][graph] - for X in:' + msg_new = '[scheduling][graph]X - for X in:' list_cp = True - if 'graph' in cfg['scheduling']: raise UpgradeError( f'Cannot upgrade deprecated item "{msg_old} -> {msg_new}" ' diff --git a/tests/functional/deprecations/01-cylc8-basic/validation.stderr b/tests/functional/deprecations/01-cylc8-basic/validation.stderr index 6dfba5d5b0d..288df3f98e2 100644 --- a/tests/functional/deprecations/01-cylc8-basic/validation.stderr +++ b/tests/functional/deprecations/01-cylc8-basic/validation.stderr @@ -48,5 +48,5 @@ WARNING - * (8.0.0) [cylc][events]abort if inactivity handler fails - DELETED ( WARNING - * (8.0.0) [cylc][events]abort if stalled handler fails - DELETED (OBSOLETE) WARNING - * (8.0.0) [cylc] -> [scheduler] - value unchanged WARNING - deprecated graph items were automatically upgraded in "workflow definition": - * (8.0.0) [scheduling][dependencies][X]graph -> [scheduling][graph] - for X in: + * (8.0.0) [scheduling][dependencies][X]graph -> [scheduling][graph]X - for X in: P1D