From cf652ff5c434821e7bc5841cbe64b8375031bd21 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Fri, 9 Aug 2024 09:06:30 -0700 Subject: [PATCH] Use globs instead of regexes for dataset type patterns queryDatasetTypes no longer supports regexes. --- python/lsst/analysis/tools/tasks/gatherResourceUsage.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/python/lsst/analysis/tools/tasks/gatherResourceUsage.py b/python/lsst/analysis/tools/tasks/gatherResourceUsage.py index 28d0a7b21..9bacf95c4 100644 --- a/python/lsst/analysis/tools/tasks/gatherResourceUsage.py +++ b/python/lsst/analysis/tools/tasks/gatherResourceUsage.py @@ -40,7 +40,6 @@ import numpy as np import pandas as pd from lsst.daf.butler import Butler, DatasetRef, DatasetType -from lsst.daf.butler.utils import globToRegex from lsst.pex.config import Field, ListField from lsst.pipe.base import ( Instrument, @@ -573,10 +572,9 @@ def __init__( # build the pipeline. input_dataset_types: Any if not dataset_type_names: - base_dataset_type_filter = re.compile(r"\w+_metadata") - input_dataset_types = base_dataset_type_filter + input_dataset_types = "*_metadata" else: - input_dataset_types = [globToRegex(expr) for expr in dataset_type_names] + input_dataset_types = dataset_type_names pipeline_graph = PipelineGraph() metadata_refs: dict[str, set[DatasetRef]] = {} consolidate_config = ConsolidateResourceUsageConfig()