From 36335f53587d594fe48fc157d4aafa9c6865c226 Mon Sep 17 00:00:00 2001 From: EddyCMWF Date: Mon, 3 Aug 2026 13:49:13 +0100 Subject: [PATCH 1/2] alternate date format --- python/pymetkit/tests/test_expand.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/python/pymetkit/tests/test_expand.py b/python/pymetkit/tests/test_expand.py index 40bdb58a3..146024c81 100644 --- a/python/pymetkit/tests/test_expand.py +++ b/python/pymetkit/tests/test_expand.py @@ -112,6 +112,15 @@ def test_date_year_day_of_year(): assert expand_key("date", "2018-23") == ["20180123"] +def test_date_range_alternate_format(): + # Check that expansion respects alternate date formats + assert expand_key("date", "2020-01-01/to/2020-01-03") == [ + "2020-01-01", + "2020-01-02", + "2020-01-03", + ] + + def test_date_range_crosses_leap_day(): # 2020 is a leap year, so 29 Feb is included. assert expand_key("date", "20200228/to/20200302") == [ From 2d63919b3aeec0acf1ef9e0a58c8a3454a788214 Mon Sep 17 00:00:00 2001 From: EddyCMWF Date: Mon, 3 Aug 2026 14:18:33 +0100 Subject: [PATCH 2/2] handle hdates --- python/pymetkit/tests/test_expand.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/python/pymetkit/tests/test_expand.py b/python/pymetkit/tests/test_expand.py index 146024c81..9ac3b26e5 100644 --- a/python/pymetkit/tests/test_expand.py +++ b/python/pymetkit/tests/test_expand.py @@ -115,9 +115,9 @@ def test_date_year_day_of_year(): def test_date_range_alternate_format(): # Check that expansion respects alternate date formats assert expand_key("date", "2020-01-01/to/2020-01-03") == [ - "2020-01-01", - "2020-01-02", - "2020-01-03", + "20200101", + "20200102", + "20200103", ] @@ -147,6 +147,15 @@ def test_month_name_climatology_passthrough(value): assert expand_key("date", value) == [value] +def test_hdate_range(): + # Check that expansion respects alternate date formats + assert expand_key("date", "20200101/to/20200103") == [ + "20200101", + "20200102", + "20200103", + ] + + # --------------------------------------------------------------------------- # Numeric / expver value normalisation # ---------------------------------------------------------------------------