Merge pull request #917 from mattwthompson/pydantic-v1-cleaner

Use `from pydantic.v1` everywhere

environment.yml

@@ -15,7 +15,7 @@ dependencies:
   - pytest-xdist
   - pytest-cov
   - pytest-rerunfailures
-  - pydantic >1
+  - pydantic >=1.10.17
   - pyyaml
   - coverage
   - cinnabar ~=0.4.0

openfe/protocols/openmm_afe/equil_afe_settings.py

@@ -33,10 +33,7 @@
 )
 import numpy as np
 
-try:
-    from pydantic.v1 import validator
-except ImportError:
-    from pydantic import validator  # type: ignore[assignment]
+from pydantic.v1 import validator
 
 
 class AlchemicalSettings(SettingsBaseModel):

openfe/protocols/openmm_md/plain_md_settings.py

@@ -19,10 +19,7 @@
     SettingsBaseModel,
     OpenMMSystemGeneratorFFSettings
 )
-try:
-    from pydantic.v1 import validator
-except ImportError:
-    from pydantic import validator  # type: ignore[assignment]
+from pydantic.v1 import validator
 
 
 class PlainMDProtocolSettings(Settings):

openfe/protocols/openmm_rfe/equil_rfe_settings.py

@@ -27,10 +27,7 @@
     OpenFFPartialChargeSettings,
 )
 
-try:
-    from pydantic.v1 import validator
-except ImportError:
-    from pydantic import validator  # type: ignore[assignment]
+from pydantic.v1 import validator
 
 
 class LambdaSettings(SettingsBaseModel):

openfe/protocols/openmm_utils/omm_settings.py

@@ -21,10 +21,7 @@
 )
 
 
-try:
-    from pydantic.v1 import validator
-except ImportError:
-    from pydantic import validator  # type: ignore[assignment]
+from pydantic.v1 import validator
 
 
 class BaseSolvationSettings(SettingsBaseModel):