From 8ebc625cd3b8c14de5fa8395b2e73d72587534ab Mon Sep 17 00:00:00 2001 From: Georgon Date: Sat, 11 Jul 2026 21:23:02 +0300 Subject: [PATCH] Black linting fix + pytest mocker 422-error fix (autospec=True) --- .github/workflows/checks.yml | 4 +++- migrations/env.py | 1 - migrations/versions/498e4ee72e00_add_session_id.py | 1 - migrations/versions/5703d0209eba_softdeletes.py | 1 - migrations/versions/c00918b76464_initial.py | 1 - migrations/versions/f51216ed6c1f_add_fullname.py | 1 - .../versions/fb8a57b65c4d_deadline_ts_rental_session.py | 1 - .../versions/fccbec47bef3_add_user_phone_to_rental_session.py | 1 - pyproject.toml | 1 - rental_backend/__init__.py | 1 - rental_backend/__main__.py | 1 - rental_backend/models/__init__.py | 1 - rental_backend/models/db.py | 1 - rental_backend/routes/__init__.py | 1 - rental_backend/routes/base.py | 1 - rental_backend/routes/event.py | 1 - rental_backend/routes/item.py | 1 - rental_backend/routes/item_type.py | 1 - rental_backend/routes/rental_session.py | 1 - rental_backend/routes/strike.py | 1 - requirements.dev.txt | 2 +- tests/conftest.py | 2 +- tests/test_routes/test_item.py | 1 - tests/test_routes/test_item_type.py | 1 - tests/test_routes/test_rental_session.py | 1 - 25 files changed, 5 insertions(+), 25 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 99f5d62..23d2bdc 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -68,7 +68,9 @@ jobs: - uses: isort/isort-action@master with: requirementsFiles: "requirements.txt requirements.dev.txt" - - uses: psf/black@23.11.0 + - uses: psf/black@stable + with: + options: "--check --diff" - name: Comment if linting failed if: failure() uses: thollander/actions-comment-pull-request@v2 diff --git a/migrations/env.py b/migrations/env.py index ee3a0ca..9467898 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -6,7 +6,6 @@ from rental_backend.models.base import BaseDbModel from rental_backend.settings import get_settings - # this is the Alembic Config object, which provides # access to the values within the .ini file in use. config = context.config diff --git a/migrations/versions/498e4ee72e00_add_session_id.py b/migrations/versions/498e4ee72e00_add_session_id.py index c41b2f1..e02e2f4 100644 --- a/migrations/versions/498e4ee72e00_add_session_id.py +++ b/migrations/versions/498e4ee72e00_add_session_id.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = '498e4ee72e00' down_revision = 'c00918b76464' branch_labels = None diff --git a/migrations/versions/5703d0209eba_softdeletes.py b/migrations/versions/5703d0209eba_softdeletes.py index da39359..8dd3c06 100644 --- a/migrations/versions/5703d0209eba_softdeletes.py +++ b/migrations/versions/5703d0209eba_softdeletes.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = '5703d0209eba' down_revision = 'f51216ed6c1f' diff --git a/migrations/versions/c00918b76464_initial.py b/migrations/versions/c00918b76464_initial.py index 2a6f48c..eefcf9c 100644 --- a/migrations/versions/c00918b76464_initial.py +++ b/migrations/versions/c00918b76464_initial.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'c00918b76464' down_revision = None branch_labels = None diff --git a/migrations/versions/f51216ed6c1f_add_fullname.py b/migrations/versions/f51216ed6c1f_add_fullname.py index baff6c7..4f37c5f 100644 --- a/migrations/versions/f51216ed6c1f_add_fullname.py +++ b/migrations/versions/f51216ed6c1f_add_fullname.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = 'f51216ed6c1f' down_revision = 'fb8a57b65c4d' diff --git a/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py b/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py index 01adb14..f92c549 100644 --- a/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py +++ b/migrations/versions/fb8a57b65c4d_deadline_ts_rental_session.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'fb8a57b65c4d' down_revision = 'fccbec47bef3' branch_labels = None diff --git a/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py b/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py index 6ffe8df..e081965 100644 --- a/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py +++ b/migrations/versions/fccbec47bef3_add_user_phone_to_rental_session.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'fccbec47bef3' down_revision = '498e4ee72e00' branch_labels = None diff --git a/pyproject.toml b/pyproject.toml index bf2a06d..7be5d91 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,6 @@ skip-string-normalization = true line_length = 120 multi_line_output = 3 profile = "black" -lines_after_imports = 2 include_trailing_comma = true [tool.pytest.ini_options] diff --git a/rental_backend/__init__.py b/rental_backend/__init__.py index aed50a4..4ed3366 100644 --- a/rental_backend/__init__.py +++ b/rental_backend/__init__.py @@ -1,4 +1,3 @@ import os - __version__ = os.getenv("APP_VERSION", "dev") diff --git a/rental_backend/__main__.py b/rental_backend/__main__.py index 0b3c742..b9e9c68 100644 --- a/rental_backend/__main__.py +++ b/rental_backend/__main__.py @@ -2,6 +2,5 @@ from rental_backend.routes.base import app - if __name__ == '__main__': uvicorn.run(app) diff --git a/rental_backend/models/__init__.py b/rental_backend/models/__init__.py index de7fcf3..4db79a4 100644 --- a/rental_backend/models/__init__.py +++ b/rental_backend/models/__init__.py @@ -1,5 +1,4 @@ from .base import Base, BaseDbModel from .db import * - __all__ = ["Base", "BaseDbModel", "Item", "ItemType", "RentalSession", "Event", "Strike"] diff --git a/rental_backend/models/db.py b/rental_backend/models/db.py index bdbe9c7..8575f79 100644 --- a/rental_backend/models/db.py +++ b/rental_backend/models/db.py @@ -25,7 +25,6 @@ from .base import BaseDbModel - settings: Settings = get_settings() diff --git a/rental_backend/routes/__init__.py b/rental_backend/routes/__init__.py index 5e4fcb1..e53b88c 100644 --- a/rental_backend/routes/__init__.py +++ b/rental_backend/routes/__init__.py @@ -1,5 +1,4 @@ from . import exc_handlers from .base import app - __all__ = ["app", "exc_handlers"] diff --git a/rental_backend/routes/base.py b/rental_backend/routes/base.py index 31a2226..04b1fa1 100644 --- a/rental_backend/routes/base.py +++ b/rental_backend/routes/base.py @@ -11,7 +11,6 @@ from rental_backend.routes.strike import strike from rental_backend.settings import get_settings - settings = get_settings() app = FastAPI( title='Сервис цифрового проката', diff --git a/rental_backend/routes/event.py b/rental_backend/routes/event.py index 8dde984..d3791b6 100644 --- a/rental_backend/routes/event.py +++ b/rental_backend/routes/event.py @@ -7,7 +7,6 @@ from rental_backend.models.db import Event from rental_backend.schemas.models import EventGet - event = APIRouter(prefix="/event", tags=["Event"]) diff --git a/rental_backend/routes/item.py b/rental_backend/routes/item.py index 1647177..76619e9 100644 --- a/rental_backend/routes/item.py +++ b/rental_backend/routes/item.py @@ -12,7 +12,6 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger - settings: Settings = get_settings() item = APIRouter(prefix="/item", tags=["Items"]) diff --git a/rental_backend/routes/item_type.py b/rental_backend/routes/item_type.py index 65964b4..90b0cbc 100644 --- a/rental_backend/routes/item_type.py +++ b/rental_backend/routes/item_type.py @@ -15,7 +15,6 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger - settings: Settings = get_settings() item_type = APIRouter(prefix="/itemtype", tags=["ItemType"]) diff --git a/rental_backend/routes/rental_session.py b/rental_backend/routes/rental_session.py index 41c657e..7a6b33e 100644 --- a/rental_backend/routes/rental_session.py +++ b/rental_backend/routes/rental_session.py @@ -26,7 +26,6 @@ from rental_backend.settings import Settings, get_settings from rental_backend.utils.action import ActionLogger - settings: Settings = get_settings() rental_session = APIRouter(prefix="/rental-sessions", tags=["RentalSession"]) diff --git a/rental_backend/routes/strike.py b/rental_backend/routes/strike.py index a0afc5d..2264bcb 100644 --- a/rental_backend/routes/strike.py +++ b/rental_backend/routes/strike.py @@ -11,7 +11,6 @@ from rental_backend.schemas.models import StrikeGet, StrikePost from rental_backend.utils.action import ActionLogger - strike = APIRouter(prefix="/strike", tags=["Strike"]) diff --git a/requirements.dev.txt b/requirements.dev.txt index 336b8df..e51c72c 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -1,5 +1,5 @@ autoflake -black==23.11.0 +black httpx isort pytest diff --git a/tests/conftest.py b/tests/conftest.py index 17b9b70..73ddc8d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -125,7 +125,7 @@ def another_authlib_user(): @pytest.fixture def authlib_mock(mocker): """Мок верификации AuthLib.""" - auth_mock = mocker.patch('auth_lib.fastapi.UnionAuth.__call__') + auth_mock = mocker.patch('auth_lib.fastapi.UnionAuth.__call__', autospec=True) return auth_mock diff --git a/tests/test_routes/test_item.py b/tests/test_routes/test_item.py index 5f0e4d7..82e2d6f 100644 --- a/tests/test_routes/test_item.py +++ b/tests/test_routes/test_item.py @@ -6,7 +6,6 @@ from rental_backend.models import Item from rental_backend.settings import get_settings - logger = logging.getLogger(__name__) url: str = '/item' diff --git a/tests/test_routes/test_item_type.py b/tests/test_routes/test_item_type.py index 764335a..fff5fac 100644 --- a/tests/test_routes/test_item_type.py +++ b/tests/test_routes/test_item_type.py @@ -5,7 +5,6 @@ from rental_backend.settings import get_settings - logger = logging.getLogger(__name__) url: str = '/itemtype' diff --git a/tests/test_routes/test_rental_session.py b/tests/test_routes/test_rental_session.py index 9aa6aa9..fe1b359 100644 --- a/tests/test_routes/test_rental_session.py +++ b/tests/test_routes/test_rental_session.py @@ -10,7 +10,6 @@ from rental_backend.schemas.models import RentStatus from tests.conftest import model_to_dict - obj_prefix: str = rental_session.prefix