From 45194f73d73278f5dd29f382ea0bcf339296eab3 Mon Sep 17 00:00:00 2001 From: WeirAE Date: Wed, 21 Feb 2024 18:01:04 -0600 Subject: [PATCH 1/6] Edit to allow supplemental YAML --- src/uwtools/config/tools.py | 4 ++-- src/uwtools/tests/config/test_tools.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/uwtools/config/tools.py b/src/uwtools/config/tools.py index 48dd4dba7..f5e322fe6 100644 --- a/src/uwtools/config/tools.py +++ b/src/uwtools/config/tools.py @@ -275,8 +275,8 @@ def _validate_format_supplemental( if isinstance(supplemental_cfg, Config) else _ensure_format(desc=pre, config=supplemental_cfg) ) - if sc_fmt != config_fmt: - raise UWError("%s format %s must match input format %s" % (pre, sc_fmt, config_fmt)) + if sc_fmt not in (FORMAT.yaml, config_fmt): + raise UWError("%s format %s must be YAML or input format %s" % (pre, sc_fmt, config_fmt)) # Import-time code diff --git a/src/uwtools/tests/config/test_tools.py b/src/uwtools/tests/config/test_tools.py index 15480b603..baff7876e 100644 --- a/src/uwtools/tests/config/test_tools.py +++ b/src/uwtools/tests/config/test_tools.py @@ -654,22 +654,22 @@ def test__validate_format_output(input_fmt, output_fmt): def test__validate_format_supplemental_fail_obj(): - config_fmt = FORMAT.yaml + config_fmt = FORMAT.ini sc = NMLConfig(config={"n": {"k": "v"}}) with raises(UWError) as e: tools._validate_format_supplemental(config_fmt=config_fmt, supplemental_cfg=sc, idx=87) - assert str(e.value) == "Supplemental config #88 format %s must match input format %s" % ( + assert str(e.value) == "Supplemental config #88 format %s must be YAML or input format %s" % ( FORMAT.nml, config_fmt, ) def test__validate_format_supplemental_fail_path(): - config_fmt = FORMAT.yaml + config_fmt = FORMAT.ini sc = Path("/path/to/config.nml") with raises(UWError) as e: tools._validate_format_supplemental(config_fmt=config_fmt, supplemental_cfg=sc, idx=87) - assert str(e.value) == "Supplemental config #%s format %s must match input format %s" % ( + assert str(e.value) == "Supplemental config #%s format %s must be YAML or input format %s" % ( 88, FORMAT.nml, config_fmt, From d63b6f635f98106b8b1743d267b89da39c65c046 Mon Sep 17 00:00:00 2001 From: Brian Weir <94982354+WeirAE@users.noreply.github.com> Date: Wed, 28 Feb 2024 21:42:00 -0500 Subject: [PATCH 2/6] Update tools.py Co-authored-by: Paul Madden <136389411+maddenp-noaa@users.noreply.github.com> --- src/uwtools/config/tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uwtools/config/tools.py b/src/uwtools/config/tools.py index 09ae7100d..fd9653c96 100644 --- a/src/uwtools/config/tools.py +++ b/src/uwtools/config/tools.py @@ -278,7 +278,7 @@ def _validate_format_supplemental( else _ensure_format(desc=pre, config=supplemental_cfg) ) if sc_fmt not in (FORMAT.yaml, config_fmt): - raise UWError("%s format %s must be YAML or input format %s" % (pre, sc_fmt, config_fmt)) + raise UWError("%s format %s must be input format %s or %s" % (pre, sc_fmt, config_fmt, FORMAT.yaml)) # Import-time code From b815a34c1192326eab27b1f419c8b7371f1a18b3 Mon Sep 17 00:00:00 2001 From: WeirAE Date: Thu, 29 Feb 2024 09:13:17 -0600 Subject: [PATCH 3/6] format run --- src/uwtools/config/tools.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/uwtools/config/tools.py b/src/uwtools/config/tools.py index fd9653c96..9b011f2a8 100644 --- a/src/uwtools/config/tools.py +++ b/src/uwtools/config/tools.py @@ -278,7 +278,9 @@ def _validate_format_supplemental( else _ensure_format(desc=pre, config=supplemental_cfg) ) if sc_fmt not in (FORMAT.yaml, config_fmt): - raise UWError("%s format %s must be input format %s or %s" % (pre, sc_fmt, config_fmt, FORMAT.yaml)) + raise UWError( + "%s format %s must be input format %s or %s" % (pre, sc_fmt, config_fmt, FORMAT.yaml) + ) # Import-time code From 6ddf28baa6ee0ff7311a670fc2dfd92d4530b412 Mon Sep 17 00:00:00 2001 From: Brian Weir <94982354+WeirAE@users.noreply.github.com> Date: Thu, 29 Feb 2024 10:14:33 -0600 Subject: [PATCH 4/6] Update src/uwtools/config/tools.py Co-authored-by: Paul Madden <136389411+maddenp-noaa@users.noreply.github.com> --- src/uwtools/config/tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uwtools/config/tools.py b/src/uwtools/config/tools.py index 9b011f2a8..9b56be11b 100644 --- a/src/uwtools/config/tools.py +++ b/src/uwtools/config/tools.py @@ -279,7 +279,7 @@ def _validate_format_supplemental( ) if sc_fmt not in (FORMAT.yaml, config_fmt): raise UWError( - "%s format %s must be input format %s or %s" % (pre, sc_fmt, config_fmt, FORMAT.yaml) + "%s format %s must be %s or input format %s" % (pre, sc_fmt, FORMAT.yaml, config_fmt) ) From 72eb9e010f6823b5ee9bf693a043267db8bec691 Mon Sep 17 00:00:00 2001 From: Brian Weir <94982354+WeirAE@users.noreply.github.com> Date: Thu, 29 Feb 2024 10:14:43 -0600 Subject: [PATCH 5/6] Update src/uwtools/tests/config/test_tools.py Co-authored-by: Paul Madden <136389411+maddenp-noaa@users.noreply.github.com> --- src/uwtools/tests/config/test_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uwtools/tests/config/test_tools.py b/src/uwtools/tests/config/test_tools.py index f9c2de183..17a83fb54 100644 --- a/src/uwtools/tests/config/test_tools.py +++ b/src/uwtools/tests/config/test_tools.py @@ -672,7 +672,7 @@ def test__validate_format_supplemental_fail_path(): sc = Path("/path/to/config.nml") with raises(UWError) as e: tools._validate_format_supplemental(config_fmt=config_fmt, supplemental_cfg=sc, idx=87) - assert str(e.value) == "Supplemental config #%s format %s must be YAML or input format %s" % ( + assert str(e.value) == "Supplemental config #%s format %s must be yaml or input format %s" % ( 88, FORMAT.nml, config_fmt, From 0782de7a496bce8e2e70843b412a77d83b0589cf Mon Sep 17 00:00:00 2001 From: Brian Weir <94982354+WeirAE@users.noreply.github.com> Date: Thu, 29 Feb 2024 10:14:48 -0600 Subject: [PATCH 6/6] Update src/uwtools/tests/config/test_tools.py Co-authored-by: Paul Madden <136389411+maddenp-noaa@users.noreply.github.com> --- src/uwtools/tests/config/test_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uwtools/tests/config/test_tools.py b/src/uwtools/tests/config/test_tools.py index 17a83fb54..5c2161b13 100644 --- a/src/uwtools/tests/config/test_tools.py +++ b/src/uwtools/tests/config/test_tools.py @@ -661,7 +661,7 @@ def test__validate_format_supplemental_fail_obj(): sc = NMLConfig(config={"n": {"k": "v"}}) with raises(UWError) as e: tools._validate_format_supplemental(config_fmt=config_fmt, supplemental_cfg=sc, idx=87) - assert str(e.value) == "Supplemental config #88 format %s must be YAML or input format %s" % ( + assert str(e.value) == "Supplemental config #88 format %s must be yaml or input format %s" % ( FORMAT.nml, config_fmt, )