From bacf3567e3aaa92c424ebe389fed4fe9ce4b7908 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 28 Sep 2026 20:49:33 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v3.20.0 → v3.21.2](https://github.com/asottile/pyupgrade/compare/v3.20.0...v3.21.2) - [github.com/hadialqattan/pycln: v2.5.0 → v2.6.0](https://github.com/hadialqattan/pycln/compare/v2.5.0...v2.6.0) - [github.com/astral-sh/ruff-pre-commit: v0.12.12 → v0.16.9](https://github.com/astral-sh/ruff-pre-commit/compare/v0.12.12...v0.16.9) - [github.com/jvllmr/pre-commit-prettier: v3.6.2 → v3.9.9](https://github.com/jvllmr/pre-commit-prettier/compare/v3.6.2...v3.9.9) - [github.com/pre-commit/mirrors-mypy: v1.17.1 → v2.3.1](https://github.com/pre-commit/mirrors-mypy/compare/v1.17.1...v2.3.1) --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e42d91f..54c0adb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,12 +1,12 @@ repos: - repo: https://github.com/asottile/pyupgrade - rev: v3.20.0 + rev: v3.21.2 hooks: - id: pyupgrade args: - --py39-plus - repo: https://github.com/hadialqattan/pycln - rev: v2.5.0 + rev: v2.6.0 hooks: - id: pycln args: @@ -22,19 +22,19 @@ repos: additional_dependencies: - black - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.12.12" + rev: "v0.16.9" hooks: - id: ruff args: - --fix - id: ruff-format - repo: https://github.com/jvllmr/pre-commit-prettier - rev: v3.6.2 + rev: v3.9.9 hooks: - id: prettier additional_dependencies: [prettier@latest, prettier-plugin-toml@latest] - repo: https://github.com/pre-commit/mirrors-mypy - rev: "v1.17.1" + rev: "v2.3.1" hooks: - id: mypy exclude: ^tests/.* From f97d654ff93795f3aa2fcf4da8a4e0b72696983c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 28 Sep 2026 20:50:59 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/sqlalchemy_sessionload/__init__.py | 2 +- src/sqlalchemy_sessionload/sort.py | 2 +- tests/model.py | 9 ++++----- tests/test_loaders.py | 3 +-- tests/test_options.py | 8 ++++---- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/sqlalchemy_sessionload/__init__.py b/src/sqlalchemy_sessionload/__init__.py index 399aef6..e201644 100644 --- a/src/sqlalchemy_sessionload/__init__.py +++ b/src/sqlalchemy_sessionload/__init__.py @@ -1,4 +1,4 @@ from .options import SessionLoad, SessionRelationshipLoad from .plugin import SQLAlchemySessionLoad -__all__ = ["SessionLoad", "SessionRelationshipLoad", "SQLAlchemySessionLoad"] +__all__ = ["SQLAlchemySessionLoad", "SessionLoad", "SessionRelationshipLoad"] diff --git a/src/sqlalchemy_sessionload/sort.py b/src/sqlalchemy_sessionload/sort.py index 7765328..20e886a 100644 --- a/src/sqlalchemy_sessionload/sort.py +++ b/src/sqlalchemy_sessionload/sort.py @@ -18,7 +18,7 @@ class Order(Enum): DESC = 1 -TSortSpec = t.Tuple[str, Order] +TSortSpec = tuple[str, Order] def _cmp_func(*args: TSortSpec): diff --git a/tests/model.py b/tests/model.py index abe8205..773f102 100644 --- a/tests/model.py +++ b/tests/model.py @@ -1,4 +1,3 @@ -import typing as t from datetime import datetime import sqlalchemy as sa @@ -39,14 +38,14 @@ class User(DeclarativeBase): ) name: sa_orm.Mapped[str] = sa.Column(sa.String, nullable=False, default=faker.name) - chat_rooms: sa_orm.Mapped[t.List["Chatroom"]] = sa_orm.relationship( + chat_rooms: sa_orm.Mapped[list["Chatroom"]] = sa_orm.relationship( "Chatroom", secondary=chatroom_members_table, back_populates="members", lazy="raise", ) - messages: sa_orm.Mapped[t.List["Message"]] = sa_orm.relationship( + messages: sa_orm.Mapped[list["Message"]] = sa_orm.relationship( "Message", back_populates="user", lazy="raise", @@ -63,7 +62,7 @@ class Chatroom(DeclarativeBase): sa.Integer, autoincrement=True, primary_key=True ) - members: sa_orm.Mapped[t.List[User]] = sa_orm.relationship( + members: sa_orm.Mapped[list[User]] = sa_orm.relationship( "User", secondary=chatroom_members_table, back_populates="chat_rooms", @@ -71,7 +70,7 @@ class Chatroom(DeclarativeBase): lazy="raise", ) - messages: sa_orm.Mapped[t.List["Message"]] = sa_orm.relationship( + messages: sa_orm.Mapped[list["Message"]] = sa_orm.relationship( "Message", back_populates="chatroom", lazy="raise", diff --git a/tests/test_loaders.py b/tests/test_loaders.py index 792d904..60cb044 100644 --- a/tests/test_loaders.py +++ b/tests/test_loaders.py @@ -1,6 +1,5 @@ from __future__ import annotations - import sqlalchemy as sa import sqlalchemy.orm as sa_orm @@ -10,7 +9,7 @@ load_from_session, ) -from .model import Message, User, Chatroom +from .model import Chatroom, Message, User message_mapper = Message.__mapper__ diff --git a/tests/test_options.py b/tests/test_options.py index f0f62be..651af9e 100644 --- a/tests/test_options.py +++ b/tests/test_options.py @@ -13,7 +13,7 @@ def test_basic_load(db_session: sa_orm.Session, benchmark: BenchmarkFixture): preloaded_messages = db_session.execute(sa.select(Message)).all() # noqa: F841 @benchmark # type:ignore[no-redef] - def loaded_messages(): # noqa: F811 + def loaded_messages(): stmt = sa.select(Message) return db_session.execute(stmt).all() @@ -24,7 +24,7 @@ def loaded_messages(): # noqa: F811 def test_basic_load_with_option( db_session: sa_orm.Session, benchmark: BenchmarkFixture ): - preloaded_messages = db_session.execute(sa.select(Message)).all() # noqa: F841 + preloaded_messages = db_session.execute(sa.select(Message)).all() @benchmark # type:ignore[no-redef] def loaded_messages(): @@ -88,13 +88,13 @@ def test_equal_result_metadata_keys(db_session: sa_orm.Session): def test_relationship_load( db_session: sa_orm.Session, benchmark: BenchmarkFixture, basic_options, lib_options ): - preloaded_messages = db_session.execute( # noqa: F841 + preloaded_messages = db_session.execute( sa.select(Message).options(*basic_options) ).all() assert len(preloaded_messages) > 0 @benchmark - def loaded_messages(): # noqa: F811 + def loaded_messages(): stmt = sa.select(Message).options(*basic_options) return db_session.execute(stmt).all()