Merge branch 'main' into feat/contrib-sqlalchemy-cleanup

Author: cofin

docs/conf.py

@@ -188,8 +188,6 @@
     (PY_CLASS, "litestar.contrib.mako.P"),
     (PY_CLASS, "JWTDecodeOptions"),
     (PY_CLASS, "litestar.template.base.P"),
-    (PY_CLASS, "litestar.contrib.pydantic.PydanticDTO"),
-    (PY_CLASS, "litestar.contrib.pydantic.PydanticPlugin"),
     (PY_CLASS, "typing.Self"),
     (PY_CLASS, "attr.AttrsInstance"),
     (PY_CLASS, "typing_extensions.TypeGuard"),

docs/release-notes/2.x-changelog.rst

@@ -1600,7 +1600,7 @@
         :pr: 2404
         :issue: 2373
 
-        A new :class:`~litestar.contrib.pydantic.PydanticPlugin` has been added, which
+        A new ``PydanticPlugin`` has been added, which
         can be used to configure Pydantic behaviour. Currently it supports setting a
         ``prefer_alias`` option, which will pass the ``by_alias=True`` flag to Pydantic
         when exporting models, as well as generate schemas accordingly.
@@ -2704,7 +2704,7 @@
         `Pydantic <https://docs.pydantic.dev/latest/>`_ have been added:
 
         - :class:`~litestar.contrib.msgspec.MsgspecDTO`
-        - :class:`~litestar.contrib.pydantic.PydanticDTO`
+        - ``PydanticDTO``
 
     .. change:: DTOs: Arbitrary generic wrappers
         :pr: 1801

docs/release-notes/changelog.rst

@@ -289,7 +289,7 @@
         :issue: 4349
 
         New ``round_trip: bool`` parameter
-        to :class:`~litestar.contrib.pydantic.PydanticPlugin` allows
+        to ``PydanticPlugin`` allows
         serializing types like ``pydanctic.Json`` correctly.
 
     .. change:: Remove deprecated ``litestar.contrib.minijinja.minijinja_from_state`` function

docs/release-notes/whats-new-2.rst

@@ -439,7 +439,7 @@ and can be used to define DTOs:
 - :class:`litestar.dto.dataclass_dto.DataclassDTO`
 - :class:`litestar.dto.msgspec_dto.MsgspecDTO`
 - :class:`advanced_alchemy.extensions.litestar.dto.SQLAlchemyDTO`
-- :class:`litestar.contrib.pydantic.PydanticDTO`
+- ``litestar.contrib.pydantic.PydanticDTO``
 - :class:`!litestar.contrib.piccolo.PiccoloDTO`
 
 For example, to define a DTO from a dataclass:

pyproject.toml

@@ -302,6 +302,7 @@ module = [
 module = [
   "litestar.plugins.pydantic.*",
   "tests.unit.test_contrib.test_pydantic.*",
+  "tests.unit.test_contrib.test_sqlalchemy",
   "tests.unit.test_logging.test_logging_config",
   "litestar.openapi.spec.base",
   "litestar.utils.helpers",