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

DM-39876: Fallback to v1 API if pydantic v2 is installed
lsst · Jul 5, 2023 · 88183d3 · 88183d3
2 parents 3a50dcc + 66160c3
commit 88183d3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,7 +27,7 @@ dependencies = [
     "lsst-pipe-base",
     "click",
     "astropy",
-    "pydantic",
+    "pydantic <3.0",
     "networkx",
     "psutil"
 ]

diff --git a/python/lsst/ctrl/mpexec/reports.py b/python/lsst/ctrl/mpexec/reports.py
@@ -28,7 +28,11 @@
 
 from lsst.daf.butler import DataCoordinate, DataId, DataIdValue
 from lsst.utils.introspection import get_full_type_name
-from pydantic import BaseModel, validator
+
+try:
+    from pydantic.v1 import BaseModel, validator
+except ModuleNotFoundError:
+    from pydantic import BaseModel, validator  # type: ignore
 
 
 def _serializeDataId(dataId: DataId) -> dict[str, DataIdValue]:

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 click
 astropy
 psutil
-pydantic < 2
+pydantic < 3.0
 networkx
 git+https://github.com/lsst/resources@main#egg=lsst-resources
 git+https://github.com/lsst/daf_butler@main#egg=lsst-daf-butler