Force v1 pydantic API if running v2

lsst · Jul 3, 2023 · 958c90c · 958c90c
1 parent 806fb6d
commit 958c90c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/python/lsst/pipe/base/_task_metadata.py b/python/lsst/pipe/base/_task_metadata.py
@@ -27,7 +27,11 @@
 from collections.abc import Collection, Iterator, Mapping, Sequence
 from typing import Any, Protocol
 
-from pydantic import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr
+try:
+    from pydantic.v1 import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr
+except ModuleNotFoundError:
+    from pydantic import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr
+
 
 _DEPRECATION_REASON = "Will be removed after v25."
 _DEPRECATION_VERSION = "v24"

diff --git a/python/lsst/pipe/base/graph/quantumNode.py b/python/lsst/pipe/base/graph/quantumNode.py
@@ -34,7 +34,11 @@
     Quantum,
     SerializedQuantum,
 )
-from pydantic import BaseModel
+
+try:
+    from pydantic.v1 import BaseModel
+except ModuleNotFoundError:
+    from pydantic import BaseModel
 
 from ..pipeline import TaskDef
 

diff --git a/python/lsst/pipe/base/tests/mocks/_storage_class.py b/python/lsst/pipe/base/tests/mocks/_storage_class.py
@@ -34,7 +34,10 @@
 from collections.abc import Callable, Iterable, Mapping
 from typing import Any, cast
 
-import pydantic
+try:
+    import pydantic.v1 as pydantic
+except ModuleNotFoundError:
+    import pydantic
 from lsst.daf.butler import (
     DatasetComponent,
     Formatter,