Merge pull request #875 from lsst/tickets/DM-42340

DM-42340: Fix some deprecation warnings
lsst · Jan 4, 2024 · d109869 · d109869
2 parents be7a6ee + d9cd81d
commit d109869
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/python/lsst/pipe/tasks/fit_multiband.py b/python/lsst/pipe/tasks/fit_multiband.py
@@ -22,16 +22,15 @@
 __all__ = ["CatalogExposure", "CatalogExposureConfig", ]
 
 from functools import cached_property
-from pydantic import Field
+from pydantic import Field, ConfigDict
 from pydantic.dataclasses import dataclass
 
 import lsst.afw.image as afwImage
 import lsst.afw.table as afwTable
 import lsst.daf.butler as dafButler
 
 
-class CatalogExposureConfig:
-    arbitrary_types_allowed = True
+CatalogExposureConfig = ConfigDict(arbitrary_types_allowed=True)
 
 
 @dataclass(frozen=True, kw_only=True, config=CatalogExposureConfig)

diff --git a/tests/test_calibrateImage.py b/tests/test_calibrateImage.py
@@ -310,7 +310,7 @@ def setUp(self):
         detector = 42
 
         # Create a and populate a test butler for runQuantum tests.
-        self.repo_path = tempfile.TemporaryDirectory()
+        self.repo_path = tempfile.TemporaryDirectory(ignore_cleanup_errors=True)
         self.repo = butlerTests.makeTestRepo(self.repo_path.name)
 
         # dataIds for fake data
@@ -366,7 +366,7 @@ def setUp(self):
         self.butler.put(afwTable.SimpleCatalog(), "ps1_pv3_3pi_20170110", self.htm_id)
 
     def tearDown(self):
-        del self.repo_path  # this removes the temporary directory
+        self.repo_path.cleanup()
 
     def test_runQuantum(self):
         task = CalibrateImageTask()