test on pydantic 2

try with interchange-rc label packages

unpin other openff deps

actually order channels correctly

remove interchange-rc channel

Revert toolkit change

Just use Pydantic v1 API, test both versions

.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]
 

openff/bespokefit/_pydantic.py

@@ -2,9 +2,8 @@
 
 import numpy
 
-try:
-    from pydantic.v1 import BaseModel as PydanticBaseModel
-    from pydantic.v1 import (
+from pydantic.v1 import BaseModel as PydanticBaseModel
+from pydantic.v1 import (
         BaseSettings,
         Extra,
         Field,
@@ -17,25 +16,8 @@
         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.generics import GenericModel
 
 
 class BaseModel(PydanticBaseModel):