REF: Use Pydantic v1 API from v2

openforcefield · Aug 1, 2023 · 650fa88 · 650fa88
1 parent ff399c9
commit 650fa88
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,13 +14,14 @@ defaults:
 
 jobs:
   test:
-    name: Test on ${{ matrix.os }}, Python ${{ matrix.python-version }}, OpenMM ${{ matrix.openmm }}
+    name: Test on ${{ matrix.os }}, Python ${{ matrix.python-version }}, OpenMM ${{ matrix.openmm }}, Pydantic ${{ matrix.pydantic-version }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [macOS-latest, ubuntu-latest]
         python-version: ["3.8", "3.9", "3.10"]
+        pydantic-version: ["1", "2"]
         openmm: [true, false]
         exclude:
           - python-version: "3.10"
@@ -44,6 +45,7 @@ jobs:
         environment-file: devtools/conda-envs/test_env.yaml
         create-args: >-
           python=${{ matrix.python-version }}
+          pydantic=${{ matrix.pydantic-version }}
 
     - name: Install conda environment without OpenMM
       if: ${{ matrix.openmm == false }}

diff --git a/devtools/conda-envs/no_openmm.yaml b/devtools/conda-envs/no_openmm.yaml
@@ -4,7 +4,7 @@ channels:
 dependencies:
   - python
   - pip
-  - pydantic <2.0.0a0
+  - pydantic
   - openff-units
   - openff-utilities
   - pytest

diff --git a/devtools/conda-envs/test_env.yaml b/devtools/conda-envs/test_env.yaml
@@ -4,7 +4,7 @@ channels:
 dependencies:
   - python
   - pip
-  - pydantic <2.0.0a0
+  - pydantic
   - openff-units
   - openff-utilities
   - pytest

diff --git a/openff/models/models.py b/openff/models/models.py
@@ -1,7 +1,12 @@
 from typing import Any, Callable, Dict
 
 from openff.units import unit
-from pydantic import BaseModel
+
+try:
+    from pydantic.v1 import BaseModel
+except ImportError:
+    from pydantic import BaseModel
+
 
 from openff.models.types import custom_quantity_encoder, json_loader
 

diff --git a/openff/models/tests/test_types.py b/openff/models/tests/test_types.py
@@ -4,12 +4,16 @@
 import pytest
 from openff.units import unit
 from openff.utilities.testing import skip_if_missing
-from pydantic import ValidationError
 
 from openff.models.exceptions import UnitValidationError
 from openff.models.models import DefaultModel
 from openff.models.types import ArrayQuantity, FloatQuantity
 
+try:
+    from pydantic.v1 import ValidationError
+except ImportError:
+    from pydantic import ValidationError
+
 
 class TestQuantityTypes:
     @skip_if_missing("openmm.unit")