From 0a8735404d71e096d1f53e8aee2b061b66367b1c Mon Sep 17 00:00:00 2001 From: David Lord Date: Sat, 6 Apr 2024 16:14:49 -0700 Subject: [PATCH] update pre-commit hooks --- .pre-commit-config.yaml | 4 ++-- pyproject.toml | 2 +- src/flask/cli.py | 6 ++---- src/flask/config.py | 6 ++---- src/flask/json/tag.py | 1 + tests/test_json.py | 2 +- tests/typing/typing_app_decorators.py | 12 ++++-------- 7 files changed, 13 insertions(+), 20 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 81e76c2e..82891617 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,12 +2,12 @@ ci: autoupdate_schedule: monthly repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.1.13 + rev: v0.3.5 hooks: - id: ruff - id: ruff-format - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: check-merge-conflict - id: debug-statements diff --git a/pyproject.toml b/pyproject.toml index 3fefae18..4deec072 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -97,7 +97,7 @@ ignore_missing_imports = true src = ["src"] fix = true show-fixes = true -show-source = true +output-format = "full" [tool.ruff.lint] select = [ diff --git a/src/flask/cli.py b/src/flask/cli.py index d4df2802..ecb292a0 100644 --- a/src/flask/cli.py +++ b/src/flask/cli.py @@ -229,15 +229,13 @@ def prepare_import(path: str) -> str: @t.overload def locate_app( module_name: str, app_name: str | None, raise_if_not_found: t.Literal[True] = True -) -> Flask: - ... +) -> Flask: ... @t.overload def locate_app( module_name: str, app_name: str | None, raise_if_not_found: t.Literal[False] = ... -) -> Flask | None: - ... +) -> Flask | None: ... def locate_app( diff --git a/src/flask/config.py b/src/flask/config.py index f2f41478..7e3ba179 100644 --- a/src/flask/config.py +++ b/src/flask/config.py @@ -27,12 +27,10 @@ class ConfigAttribute(t.Generic[T]): self.get_converter = get_converter @t.overload - def __get__(self, obj: None, owner: None) -> te.Self: - ... + def __get__(self, obj: None, owner: None) -> te.Self: ... @t.overload - def __get__(self, obj: App, owner: type[App]) -> T: - ... + def __get__(self, obj: App, owner: type[App]) -> T: ... def __get__(self, obj: App | None, owner: type[App] | None = None) -> T | te.Self: if obj is None: diff --git a/src/flask/json/tag.py b/src/flask/json/tag.py index 2bb986bc..8dc3629b 100644 --- a/src/flask/json/tag.py +++ b/src/flask/json/tag.py @@ -40,6 +40,7 @@ be processed before ``dict``. app.session_interface.serializer.register(TagOrderedDict, index=0) """ + from __future__ import annotations import typing as t diff --git a/tests/test_json.py b/tests/test_json.py index 500eb64d..1e2b27dc 100644 --- a/tests/test_json.py +++ b/tests/test_json.py @@ -176,7 +176,7 @@ def test_jsonify_aware_datetimes(tz): def test_jsonify_uuid_types(app, client): """Test jsonify with uuid.UUID types""" - test_uuid = uuid.UUID(bytes=b"\xDE\xAD\xBE\xEF" * 4) + test_uuid = uuid.UUID(bytes=b"\xde\xad\xbe\xef" * 4) url = "/uuid_test" app.add_url_rule(url, url, lambda: flask.jsonify(x=test_uuid)) diff --git a/tests/typing/typing_app_decorators.py b/tests/typing/typing_app_decorators.py index c8d01113..0e25a30c 100644 --- a/tests/typing/typing_app_decorators.py +++ b/tests/typing/typing_app_decorators.py @@ -17,20 +17,16 @@ async def after_async(response: Response) -> Response: @app.before_request -def before_sync() -> None: - ... +def before_sync() -> None: ... @app.before_request -async def before_async() -> None: - ... +async def before_async() -> None: ... @app.teardown_appcontext -def teardown_sync(exc: BaseException | None) -> None: - ... +def teardown_sync(exc: BaseException | None) -> None: ... @app.teardown_appcontext -async def teardown_async(exc: BaseException | None) -> None: - ... +async def teardown_async(exc: BaseException | None) -> None: ...