diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 52fbf712..de3b3ea8 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -25,7 +25,7 @@ jobs: matrix: os: [ubuntu-latest, macOS-latest] python-version: ["3.10", "3.11"] - pydantic-version: ["1"] + pydantic-version: ["1", "2"] openeye: [true, false] integration: [true] diff --git a/openff/bespokefit/_pydantic.py b/openff/bespokefit/_pydantic.py index 3eb425b3..d2f82166 100644 --- a/openff/bespokefit/_pydantic.py +++ b/openff/bespokefit/_pydantic.py @@ -1,41 +1,22 @@ """A set of common utilities and types useful for building pydantic models.""" import numpy - -try: - from pydantic.v1 import BaseModel as PydanticBaseModel - from pydantic.v1 import ( - BaseSettings, - Extra, - Field, - PositiveFloat, - PositiveInt, - ValidationError, - conint, - conlist, - parse_file_as, - parse_obj_as, - parse_raw_as, - validator, - ) - from pydantic.v1.generics import GenericModel -except ImportError: - from pydantic import BaseModel as PydanticBaseModel - from pydantic import ( # noqa - BaseSettings, - Extra, - Field, - PositiveFloat, - PositiveInt, - ValidationError, - conint, - conlist, - parse_file_as, - parse_obj_as, - parse_raw_as, - validator, - ) - from pydantic.generics import GenericModel # noqa +from pydantic.v1 import BaseModel as PydanticBaseModel +from pydantic.v1 import ( + BaseSettings, + Extra, + Field, + PositiveFloat, + PositiveInt, + ValidationError, + conint, + conlist, + parse_file_as, + parse_obj_as, + parse_raw_as, + validator, +) +from pydantic.v1.generics import GenericModel class BaseModel(PydanticBaseModel): diff --git a/setup.cfg b/setup.cfg index f00aeb85..0ce5ba94 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,6 +15,8 @@ exclude_lines = max-line-length = 88 ignore = E203, E266, E501, W503, E704 select = B,C,E,F,W,T4,B9 +per-file-ignores = + openff/bespokefit/_pydantic.py:F401 [isort] multi_line_output=3