[pre-commit.ci] pre-commit autoupdate (#668)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.9.9 → v0.11.4](astral-sh/ruff-pre-commit@v0.9.9...v0.11.4)
- [github.com/python-jsonschema/check-jsonschema: 0.31.2 → 0.32.1](python-jsonschema/check-jsonschema@0.31.2...0.32.1)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Address ruff issues

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Steven Loria <[email protected]>

Author: pre-commit-ci[bot]

.pre-commit-config.yaml

@@ -2,12 +2,12 @@ ci:
   autoupdate_schedule: monthly
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.9.9
+  rev: v0.11.4
   hooks:
     - id: ruff
     - id: ruff-format
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.31.2
+  rev: 0.32.1
   hooks:
     - id: check-github-workflows
     - id: check-readthedocs

pyproject.toml

@@ -34,7 +34,7 @@ docs = [
   "sphinx-copybutton==0.5.2",
   "sphinx-design==0.6.1",
   "sphinx-issues==5.0.0",
-  "sphinx==8.2.3",
+  "sphinx==8.2.3; python_version >= '3.11'",
   "sphinxext-opengraph==0.10.0",
 ]
 tests = ["pytest<9", "pytest-lazy-fixtures"]

src/marshmallow_sqlalchemy/convert.py

@@ -375,7 +375,7 @@ def _get_field_class_for_data_type(
                 if _is_field(field_or_factory):
                     field_cls = field_or_factory
                 else:
-                    field_cls = cast(_FieldClassFactory, field_or_factory)(
+                    field_cls = cast("_FieldClassFactory", field_or_factory)(
                         self, data_type
                     )
                 break
@@ -394,7 +394,7 @@ def _get_field_class_for_data_type(
                 raise ModelConversionError(
                     f"Could not find field column of type {types[0]}."
                 )
-        return cast(type[fields.Field], field_cls)
+        return cast("type[fields.Field]", field_cls)
 
     def _get_field_class_for_property(self, prop) -> type[fields.Field]:
         field_cls: type[fields.Field]

src/marshmallow_sqlalchemy/fields.py

@@ -66,7 +66,7 @@ def related_model(self) -> type[DeclarativeMeta]:
             raise RuntimeError(
                 "Cannot access related_model if schema does not have a model."
             )
-        model_attr = getattr(self.model, cast(str, self.attribute or self.name))
+        model_attr = getattr(self.model, cast("str", self.attribute or self.name))
         if hasattr(model_attr, "remote_attr"):  # handle association proxies
             model_attr = model_attr.remote_attr
         return model_attr.property.mapper.class_

src/marshmallow_sqlalchemy/load_instance_mixin.py

@@ -10,15 +10,17 @@
 
 import importlib.metadata
 from collections.abc import Iterable, Mapping, Sequence
-from typing import Any, Generic, TypeVar, Union, cast
+from typing import TYPE_CHECKING, Any, Generic, TypeVar, Union, cast
 
 import marshmallow as ma
 from sqlalchemy.ext.declarative import DeclarativeMeta
-from sqlalchemy.orm import Session
 from sqlalchemy.orm.exc import ObjectDeletedError
 
 from .fields import get_primary_keys
 
+if TYPE_CHECKING:
+    from sqlalchemy.orm import Session
+
 _LoadDataV3 = Union[Mapping[str, Any], Iterable[Mapping[str, Any]]]
 _LoadDataV4 = Union[Mapping[str, Any], Sequence[Mapping[str, Any]]]
 _LoadDataT = TypeVar("_LoadDataT", _LoadDataV3, _LoadDataV4)
@@ -27,8 +29,8 @@
 
 def _cast_data(data):
     if int(importlib.metadata.version("marshmallow")[0]) >= 4:
-        return cast(_LoadDataV4, data)
-    return cast(_LoadDataV3, data)
+        return cast("_LoadDataV4", data)
+    return cast("_LoadDataV3", data)
 
 
 class LoadInstanceMixin:
@@ -87,12 +89,12 @@ def get_instance(self, data) -> _ModelType | None:
             """
             if self.transient:
                 return None
-            model = cast(type[_ModelType], self.opts.model)
+            model = cast("type[_ModelType]", self.opts.model)
             props = get_primary_keys(model)
             filters = {prop.key: data.get(prop.key) for prop in props}
             if None not in filters.values():
                 try:
-                    return cast(Session, self.session).get(model, filters)
+                    return cast("Session", self.session).get(model, filters)
                 except ObjectDeletedError:
                     return None
             return None
@@ -114,7 +116,7 @@ def make_instance(self, data, **kwargs) -> _ModelType:
                     setattr(instance, key, value)
                 return instance
             kwargs, association_attrs = self._split_model_kwargs_association(data)
-            ModelClass = cast(DeclarativeMeta, self.opts.model)
+            ModelClass = cast("DeclarativeMeta", self.opts.model)
             instance = ModelClass(**kwargs)
             for attr, value in association_attrs.items():
                 setattr(instance, attr, value)
@@ -144,7 +146,7 @@ def load(
                 raise ValueError("Deserialization requires a session")
             self.instance = instance or self.instance
             try:
-                return cast(ma.Schema, super()).load(_cast_data(data), **kwargs)
+                return cast("ma.Schema", super()).load(_cast_data(data), **kwargs)
             finally:
                 self.instance = None
 
@@ -159,7 +161,7 @@ def validate(
             self._session = session or self._session
             if not (self.transient or self.session):
                 raise ValueError("Validation requires a session")
-            return cast(ma.Schema, super()).validate(_cast_data(data), **kwargs)
+            return cast("ma.Schema", super()).validate(_cast_data(data), **kwargs)
 
         def _split_model_kwargs_association(self, data):
             """Split serialized attrs to ensure association proxies are passed separately.

src/marshmallow_sqlalchemy/schema.py

@@ -46,7 +46,7 @@ def create_field(
         if model:
             return converter.field_for(model, column_name, **self.field_kwargs)
         table = self.table if self.table is not None else schema_opts.table
-        column = getattr(cast(sa.Table, table).columns, column_name)
+        column = getattr(cast("sa.Table", table).columns, column_name)
         return converter.column2field(column, **self.field_kwargs)
 
     # This field should never be bound to a schema.

tests/test_conversion.py

@@ -388,7 +388,7 @@ def test_field_for_can_override_validators(self, models, session):
             models.Student, "full_name", validate=[validate.Length(max=20)]
         )
         assert len(field.validators) == 1
-        validator = cast(validate.Length, field.validators[0])
+        validator = cast("validate.Length", field.validators[0])
         assert validator.max == 20
 
         field = field_for(models.Student, "full_name", validate=[])