Switch to DataCoordinate.make_empty.

python/lsst/pipe/base/_dataset_handle.py

@@ -44,7 +44,7 @@
 
 # Use an empty dataID as a default.
 def _default_dataId() -> DataCoordinate:
-    return DataCoordinate.makeEmpty(DimensionUniverse())
+    return DataCoordinate.make_empty(DimensionUniverse())
 
 
 @dataclasses.dataclass(frozen=True, init=False)
@@ -56,7 +56,7 @@ class InMemoryDatasetHandle:
     parameters will be converted into a dataId-like entity.
     """
 
-    _empty = DataCoordinate.makeEmpty(DimensionUniverse())
+    _empty = DataCoordinate.make_empty(DimensionUniverse())
 
     def __init__(
         self,

python/lsst/pipe/base/pipeline.py

@@ -634,7 +634,7 @@ def get_data_id(self, universe: DimensionUniverse) -> DataCoordinate:
             instrument_class = cast(PipeBaseInstrument, doImportType(instrument_class_name))
             if instrument_class is not None:
                 return DataCoordinate.standardize(instrument=instrument_class.getName(), universe=universe)
-        return DataCoordinate.makeEmpty(universe)
+        return DataCoordinate.make_empty(universe)
 
     def addTask(self, task: type[PipelineTask] | str, label: str) -> None:
         """Add a new task to the pipeline, or replace a task that is already

python/lsst/pipe/base/quantum_graph_builder.py

@@ -191,7 +191,7 @@ def __init__(
             raise ValueError("No output RUN collection provided.")
         self.output_run = output_run
         self.skip_existing_in = skip_existing_in
-        self.empty_data_id = DataCoordinate.makeEmpty(butler.dimensions)
+        self.empty_data_id = DataCoordinate.make_empty(butler.dimensions)
         self.clobber = clobber
         # See whether the output run already exists.
         self.output_run_exists = False

tests/test_dataset_handle.py

@@ -139,7 +139,7 @@ def test_dataset_handle_dataid(self):
         hdl = InMemoryDatasetHandle(42)
         self.assertEqual(dict(hdl.dataId.required), {})
 
-        dataId = DataCoordinate.makeEmpty(DimensionUniverse())
+        dataId = DataCoordinate.make_empty(DimensionUniverse())
         hdl = InMemoryDatasetHandle(42, dataId=dataId)
         self.assertIs(hdl.dataId, dataId)
 

tests/test_pipeline_graph.py

@@ -1248,7 +1248,7 @@ def test_inputs_compatible_with_registry(self) -> None:
             b_i.adapt_dataset_type(dataset_type),
             dataset_type.overrideStorageClass(get_mock_name("ArrowAstropy")),
         )
-        data_id = DataCoordinate.makeEmpty(self.dimensions)
+        data_id = DataCoordinate.make_empty(self.dimensions)
         ref = DatasetRef(dataset_type, data_id, run="r")
         a_ref = a_i.adapt_dataset_ref(ref)
         b_ref = b_i.adapt_dataset_ref(ref)
@@ -1277,7 +1277,7 @@ def test_output_compatible_with_registry(self) -> None:
             a_o.adapt_dataset_type(dataset_type),
             dataset_type.overrideStorageClass(get_mock_name("ArrowTable")),
         )
-        data_id = DataCoordinate.makeEmpty(self.dimensions)
+        data_id = DataCoordinate.make_empty(self.dimensions)
         ref = DatasetRef(dataset_type, data_id, run="r")
         a_ref = a_o.adapt_dataset_ref(ref)
         self.assertEqual(a_ref, ref.overrideStorageClass(get_mock_name("ArrowTable")))
@@ -1310,7 +1310,7 @@ def test_inputs_compatible_with_output(self) -> None:
             b_i.adapt_dataset_type(graph.dataset_types["d"].dataset_type),
             graph.dataset_types["d"].dataset_type.overrideStorageClass(get_mock_name("ArrowAstropy")),
         )
-        data_id = DataCoordinate.makeEmpty(self.dimensions)
+        data_id = DataCoordinate.make_empty(self.dimensions)
         ref = DatasetRef(graph.dataset_types["d"].dataset_type, data_id, run="r")
         a_ref = a_o.adapt_dataset_ref(ref)
         b_ref = b_i.adapt_dataset_ref(ref)
@@ -1342,7 +1342,7 @@ def test_component_resolved_by_input(self) -> None:
             b_i.adapt_dataset_type(parent_dataset_type),
             parent_dataset_type.makeComponentDatasetType("schema"),
         )
-        data_id = DataCoordinate.makeEmpty(self.dimensions)
+        data_id = DataCoordinate.make_empty(self.dimensions)
         ref = DatasetRef(parent_dataset_type, data_id, run="r")
         a_ref = a_i.adapt_dataset_ref(ref)
         b_ref = b_i.adapt_dataset_ref(ref)
@@ -1376,7 +1376,7 @@ def test_component_resolved_by_output(self) -> None:
             b_i.adapt_dataset_type(parent_dataset_type),
             parent_dataset_type.makeComponentDatasetType("schema"),
         )
-        data_id = DataCoordinate.makeEmpty(self.dimensions)
+        data_id = DataCoordinate.make_empty(self.dimensions)
         ref = DatasetRef(parent_dataset_type, data_id, run="r")
         a_ref = a_o.adapt_dataset_ref(ref)
         b_ref = b_i.adapt_dataset_ref(ref)
@@ -1405,7 +1405,7 @@ def test_component_resolved_by_registry(self) -> None:
             b_i.adapt_dataset_type(parent_dataset_type),
             parent_dataset_type.makeComponentDatasetType("schema"),
         )
-        data_id = DataCoordinate.makeEmpty(self.dimensions)
+        data_id = DataCoordinate.make_empty(self.dimensions)
         ref = DatasetRef(parent_dataset_type, data_id, run="r")
         b_ref = b_i.adapt_dataset_ref(ref)
         self.assertEqual(b_ref, ref.makeComponentRef("schema"))

tests/test_quantumGraph.py

@@ -218,7 +218,7 @@ def _makeDatasetType(connection):
                     initRefs = [
                         DatasetRef(
                             initInputDSType,
-                            DataCoordinate.makeEmpty(universe),
+                            DataCoordinate.make_empty(universe),
                             run=self.input_collection,
                         )
                     ]
@@ -229,7 +229,7 @@ def _makeDatasetType(connection):
             if connections.initOutputs:
                 initOutputDSType = _makeDatasetType(connections.initOutput)
                 initRefs = [
-                    DatasetRef(initOutputDSType, DataCoordinate.makeEmpty(universe), run=self.output_run)
+                    DatasetRef(initOutputDSType, DataCoordinate.make_empty(universe), run=self.output_run)
                 ]
                 init_dataset_refs[initOutputDSType] = initRefs[0]
                 initOutputs[taskDef] = initRefs
@@ -262,7 +262,7 @@ def _makeDatasetType(connection):
         self.packagesDSType = DatasetType("packages", universe.empty, storageClass="Packages")
         dataset_types.add(self.packagesDSType)
         globalInitOutputs = [
-            DatasetRef(self.packagesDSType, DataCoordinate.makeEmpty(universe), run=self.output_run)
+            DatasetRef(self.packagesDSType, DataCoordinate.make_empty(universe), run=self.output_run)
         ]
         self.qGraph = QuantumGraph(
             quantumMap,