From d6b9e1d2b0e7c3fa37daa36b9c0ba00c8e7a7392 Mon Sep 17 00:00:00 2001 From: Gui Castelao Date: Thu, 5 Oct 2023 19:26:32 -0600 Subject: [PATCH] fix: AQUA-L2 new filename pattern --- OceanColor/backend/common.py | 6 ++++++ tests/test_inrange.py | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/OceanColor/backend/common.py b/OceanColor/backend/common.py index dd3b2bb..568a739 100644 --- a/OceanColor/backend/common.py +++ b/OceanColor/backend/common.py @@ -311,6 +311,12 @@ def parse_filename(filename: str): (?P\d{4}) (?P\d{2}) (?P\d{2}) + (?: + T + (?P\d{2}) + (?P\d{2}) + (?P\d{2}) + )? . (?P(L2)|(L3m)) (?:.DAY)? diff --git a/tests/test_inrange.py b/tests/test_inrange.py index 62bd32e..d4d0879 100644 --- a/tests/test_inrange.py +++ b/tests/test_inrange.py @@ -25,10 +25,8 @@ db.backend = FileSystem("./") - -@pytest.mark.skip() def test_matchup_L2(): - ds = db["A2017012213500.L2_LAC_OC.nc"] + ds = db["AQUA_MODIS.20170112T213500.L2.OC.nc"] dL_tol = 12e3 dt_tol = timedelta64(6, 'h') track = DataFrame([