Fix deprecation warnings from DataCoordinate.

lsst-dm · Nov 30, 2023 · 571b22c · 571b22c
1 parent 091d7fc
commit 571b22c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/tests/test_middleware_interface.py b/tests/test_middleware_interface.py
@@ -659,10 +659,10 @@ def test_clean_local_repo(self):
                                         butler.dimensions,
                                         self.interface.instrument,
                                         self.next_visit)
-        processed_data_id = {(k if k != "exposure" else "visit"): v for k, v in raw_data_id.items()}
+        processed_data_id = {(k if k != "exposure" else "visit"): v for k, v in raw_data_id.required.items()}
         butler_tests.addDataIdValue(butler, "exposure", raw_data_id["exposure"])
         butler_tests.addDataIdValue(butler, "visit", processed_data_id["visit"])
-        butler_tests.addDatasetType(butler, "raw", raw_data_id.keys(), "Exposure")
+        butler_tests.addDatasetType(butler, "raw", raw_data_id.required.keys(), "Exposure")
         butler_tests.addDatasetType(butler, "src", processed_data_id.keys(), "SourceCatalog")
         butler_tests.addDatasetType(butler, "calexp", processed_data_id.keys(), "ExposureF")
 
@@ -973,9 +973,10 @@ def _simulate_run(self):
         """Create a mock pipeline execution that stores a calexp for self.raw_data_id.
         """
         exp = lsst.afw.image.ExposureF(20, 20)
-        self.processed_data_id = {(k if k != "exposure" else "visit"): v for k, v in self.raw_data_id.items()}
+        self.processed_data_id = {(k if k != "exposure" else "visit"): v
+                                  for k, v in self.raw_data_id.required.items()}
         self.second_processed_data_id = {(k if k != "exposure" else "visit"): v
-                                         for k, v in self.second_data_id.items()}
+                                         for k, v in self.second_data_id.required.items()}
         # Dataset types defined for local Butler on pipeline run, but code
         # assumes output types already exist in central repo.
         butler_tests.addDatasetType(self.interface.central_butler, "calexp",