Smallest possible change to bump to Pydantic 2.x

This leaves in place usage of several Pydantic 1.x-isms, which will need to be excised before Pydantic 3.x can be supported.

Author: charles-dyfis-net

pyproject.toml

@@ -12,7 +12,7 @@ dependencies = [
     "SQLAlchemy[asyncio]<2.1.0,>=2.0.0",
     "SQLAlchemy-Utils",
     "anyio>=3.0.0,<4",
-    "pydantic~=1.10.13",
+    "pydantic~=2.5.3",
     "tenacity~=8.0.1",
     "sqlapagination",
     "exceptiongroup",
@@ -63,7 +63,15 @@ excludes = [
 [tool.pytest.ini_options]
 addopts = "-rsx --tb=short --loop-scope session"
 testpaths = ["tests"]
-filterwarnings = ["error"]
+filterwarnings = [
+    "error",
+    # Several pending fixes to be a well-behaved pydantic 2.0 user
+    "ignore:.*The `parse_obj` method is deprecated.*:pydantic.warnings.PydanticDeprecatedSince20",
+    "ignore:.*The `dict` method is deprecated; use `model_dump` instead.*:pydantic.warnings.PydanticDeprecatedSince20",
+    "ignore:.*Support for class-based `config` is deprecated, use ConfigDict instead.*:pydantic.warnings.PydanticDeprecatedSince20",
+    "ignore:.*Pydantic V1 style `@root_validator` validators are deprecated.*:pydantic.warnings.PydanticDeprecatedSince20",
+    "ignore:.*Field .* has conflict with protected namespace \"model_\".*:UserWarning",
+]
 asyncio_mode = "auto"
 py311_task = true
 log_cli = true

src/quart_sqlalchemy/config.py

@@ -138,7 +138,7 @@ class EngineConfig(ConfigBase):
     def default(cls):
         return cls(url="sqlite://")
 
-    @root_validator
+    @root_validator(pre=True)
     def apply_driver_defaults(cls, values):
         url = sa.make_url(values["url"])
         driver = url.drivername
@@ -221,15 +221,15 @@ class BindConfig(ConfigBase):
     session: SessionmakerOptions = Field(default_factory=SessionmakerOptions.default)
     engine: EngineConfig = Field(default_factory=EngineConfig.default)
 
-    @root_validator
+    @root_validator(pre=True)
     def validate_dialect(cls, values):
         return validate_dialect(cls, values, "sync")
 
 
 class AsyncBindConfig(BindConfig):
     session: AsyncSessionmakerOptions = Field(default_factory=AsyncSessionmakerOptions.default)
 
-    @root_validator
+    @root_validator(pre=True)
     def validate_dialect(cls, values):
         return validate_dialect(cls, values, "async")