diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 40c04dc4..473b1d70 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.5 + rev: v0.8.2 hooks: - id: ruff args: diff --git a/requirements-tests.txt b/requirements-tests.txt index 7999a0fb..a573f270 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -3,7 +3,7 @@ pytest >=4.4.0,<9.0.0 coverage[toml] >=6.2,<8.0 mypy ==1.13.0 -ruff ==0.5.5 +ruff ==0.8.2 # Needed explicitly by fastapi-cli-slim fastapi-slim uvicorn diff --git a/tests/conftest.py b/tests/conftest.py index 955fd227..ee744724 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2,9 +2,10 @@ from typing import Generator import pytest -from fastapi_cli.logging import setup_logging from typer import rich_utils +from fastapi_cli.logging import setup_logging + @pytest.fixture(autouse=True) def reset_syspath() -> Generator[None, None, None]: diff --git a/tests/test_cli.py b/tests/test_cli.py index 9d8b9ae1..8bdba1c7 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -4,10 +4,10 @@ from unittest.mock import patch import uvicorn -from fastapi_cli.cli import app -from fastapi_cli.utils.cli import get_uvicorn_log_config from typer.testing import CliRunner +from fastapi_cli.cli import app +from fastapi_cli.utils.cli import get_uvicorn_log_config from tests.utils import changing_dir runner = CliRunner() diff --git a/tests/test_requirements.py b/tests/test_requirements.py index fdc99f34..98306111 100644 --- a/tests/test_requirements.py +++ b/tests/test_requirements.py @@ -1,9 +1,10 @@ from pathlib import Path import pytest +from typer.testing import CliRunner + from fastapi_cli.discover import get_import_data from fastapi_cli.exceptions import FastAPICLIException -from typer.testing import CliRunner from .utils import changing_dir @@ -13,9 +14,10 @@ def test_no_uvicorn() -> None: - import fastapi_cli.cli import uvicorn + import fastapi_cli.cli + fastapi_cli.cli.uvicorn = None # type: ignore[attr-defined, assignment] with changing_dir(assets_path): @@ -31,9 +33,10 @@ def test_no_uvicorn() -> None: def test_no_fastapi() -> None: - import fastapi_cli.discover from fastapi import FastAPI + import fastapi_cli.discover + fastapi_cli.discover.FastAPI = None # type: ignore[attr-defined, assignment] with changing_dir(assets_path): with pytest.raises(FastAPICLIException) as exc_info: diff --git a/tests/test_utils_default_dir.py b/tests/test_utils_default_dir.py index 8ed8ac06..0af7d37c 100644 --- a/tests/test_utils_default_dir.py +++ b/tests/test_utils_default_dir.py @@ -1,6 +1,7 @@ from pathlib import Path import pytest + from fastapi_cli.discover import get_import_data from fastapi_cli.exceptions import FastAPICLIException diff --git a/tests/test_utils_default_file.py b/tests/test_utils_default_file.py index 8bddcea0..1190754e 100644 --- a/tests/test_utils_default_file.py +++ b/tests/test_utils_default_file.py @@ -3,9 +3,10 @@ from pathlib import Path import pytest +from pytest import CaptureFixture + from fastapi_cli.discover import get_import_data from fastapi_cli.exceptions import FastAPICLIException -from pytest import CaptureFixture from .utils import changing_dir diff --git a/tests/test_utils_package.py b/tests/test_utils_package.py index fb878f9a..407561da 100644 --- a/tests/test_utils_package.py +++ b/tests/test_utils_package.py @@ -1,10 +1,10 @@ from pathlib import Path import pytest -from fastapi_cli.discover import get_import_data -from fastapi_cli.exceptions import FastAPICLIException from pytest import CaptureFixture +from fastapi_cli.discover import get_import_data +from fastapi_cli.exceptions import FastAPICLIException from tests.utils import changing_dir assets_path = Path(__file__).parent / "assets" diff --git a/tests/test_utils_single_file.py b/tests/test_utils_single_file.py index 3f5addec..da8eba1c 100644 --- a/tests/test_utils_single_file.py +++ b/tests/test_utils_single_file.py @@ -1,9 +1,10 @@ from pathlib import Path import pytest +from pytest import CaptureFixture + from fastapi_cli.discover import get_import_data from fastapi_cli.exceptions import FastAPICLIException -from pytest import CaptureFixture from .utils import changing_dir