Merge pull request #350 from lsst/tickets/DM-39876

DM-39876: Force v1 pydantic API if running v2

pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
     "lsst-daf-butler",
     "lsst-pex-config",
     "astropy",
-    "pydantic",
+    "pydantic <3.0",
     "networkx",
     "pyyaml >= 5.1",
     "numpy >= 1.17",

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  # type: ignore
+
 
 _DEPRECATION_REASON = "Will be removed after v25."
 _DEPRECATION_VERSION = "v24"

python/lsst/pipe/base/graph/quantumNode.py

@@ -36,7 +36,11 @@
     SerializedQuantum,
 )
 from lsst.utils.introspection import find_outside_stacklevel
-from pydantic import BaseModel
+
+try:
+    from pydantic.v1 import BaseModel
+except ModuleNotFoundError:
+    from pydantic import BaseModel  # type: ignore
 
 from ..pipeline import TaskDef
 

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  # type: ignore
 from lsst.daf.butler import (
     DatasetComponent,
     Formatter,

requirements.txt

@@ -1,5 +1,5 @@
 pyyaml >= 5.1
-pydantic < 2
+pydantic < 3.0
 numpy >= 1.17
 networkx
 frozendict