From 181ca35137cba4f54cece869f1d191e9ee2841a1 Mon Sep 17 00:00:00 2001 From: d3vyce Date: Mon, 30 Mar 2026 14:04:36 -0400 Subject: [PATCH] chore: remove deprecated code --- docs/module/pytest.md | 3 --- src/fastapi_toolsets/pytest/utils.py | 26 ++------------------------ tests/test_pytest.py | 13 ------------- 3 files changed, 2 insertions(+), 40 deletions(-) diff --git a/docs/module/pytest.md b/docs/module/pytest.md index 52824b8..c52746f 100644 --- a/docs/module/pytest.md +++ b/docs/module/pytest.md @@ -79,9 +79,6 @@ The examples above are already compatible with parallel test execution with `pyt ## Cleaning up tables -!!! warning - Since `V2.1.0` `cleanup_tables` now live in `fastapi_toolsets.db`. For backward compatibility the function is still available in `fastapi_toolsets.pytest`, but this will be remove in `V3.0.0`. - If you want to manually clean up a database you can use [`cleanup_tables`](../reference/db.md#fastapi_toolsets.db.cleanup_tables), this will truncate all tables between tests for fast isolation: ```python diff --git a/src/fastapi_toolsets/pytest/utils.py b/src/fastapi_toolsets/pytest/utils.py index f97316c..5242063 100644 --- a/src/fastapi_toolsets/pytest/utils.py +++ b/src/fastapi_toolsets/pytest/utils.py @@ -1,7 +1,6 @@ """Pytest helper utilities for FastAPI testing.""" import os -import warnings from collections.abc import AsyncGenerator, Callable from contextlib import asynccontextmanager from typing import Any @@ -16,31 +15,10 @@ from sqlalchemy.ext.asyncio import ( ) from sqlalchemy.orm import DeclarativeBase -from ..db import cleanup_tables as _cleanup_tables -from ..db import create_database +from ..db import cleanup_tables, create_database from ..models.watched import EventSession -async def cleanup_tables( - session: AsyncSession, - base: type[DeclarativeBase], -) -> None: - """Truncate all tables for fast between-test cleanup. - - .. deprecated:: - Import ``cleanup_tables`` from ``fastapi_toolsets.db`` instead. - This re-export will be removed in v3.0.0. - """ - warnings.warn( - "Importing cleanup_tables from fastapi_toolsets.pytest is deprecated " - "and will be removed in v3.0.0. " - "Use 'from fastapi_toolsets.db import cleanup_tables' instead.", - DeprecationWarning, - stacklevel=2, - ) - await _cleanup_tables(session=session, base=base) - - def _get_xdist_worker(default_test_db: str) -> str: """Return the pytest-xdist worker name, or *default_test_db* when not running under xdist. @@ -273,7 +251,7 @@ async def create_db_session( yield session if cleanup: - await _cleanup_tables(session=session, base=base) + await cleanup_tables(session=session, base=base) if drop_tables: async with engine.begin() as conn: diff --git a/tests/test_pytest.py b/tests/test_pytest.py index b0ffa67..b277251 100644 --- a/tests/test_pytest.py +++ b/tests/test_pytest.py @@ -374,19 +374,6 @@ class TestCreateDbSession: pass -class TestDeprecatedCleanupTables: - """Tests for the deprecated cleanup_tables re-export in fastapi_toolsets.pytest.""" - - @pytest.mark.anyio - async def test_emits_deprecation_warning(self): - """cleanup_tables imported from fastapi_toolsets.pytest emits DeprecationWarning.""" - from fastapi_toolsets.pytest.utils import cleanup_tables - - async with create_db_session(DATABASE_URL, Base, drop_tables=True) as session: - with pytest.warns(DeprecationWarning, match="fastapi_toolsets.db"): - await cleanup_tables(session, Base) - - class TestGetXdistWorker: """Tests for _get_xdist_worker helper."""