Merge pull request #1019 from Aiven-Open/jjaakola-aiven-fastapi-use-ruff

chore: use ruff

.pre-commit-config.yaml

@@ -30,36 +30,6 @@ repos:
   hooks:
   - id: shfmt
 
-- repo: https://github.com/asottile/pyupgrade
-  rev: v3.4.0
-  hooks:
-  - id: pyupgrade
-    args: [ --py310-plus ]
-
-- repo: https://github.com/pycqa/autoflake
-  rev: v2.1.1
-  hooks:
-    - id: autoflake
-      args:
-        - --in-place
-        - --remove-all-unused-imports
-        - --ignore-init-module-imports
-
-- repo: https://github.com/PyCQA/isort
-  rev: 5.12.0
-  hooks:
-  - id: isort
-
-- repo: https://github.com/psf/black
-  rev: 23.3.0
-  hooks:
-  - id: black
-
-- repo: https://github.com/PyCQA/flake8
-  rev: 7.1.0
-  hooks:
-  - id: flake8
-
 - repo: https://github.com/hadolint/hadolint
   rev: v2.12.0
   hooks:
@@ -70,9 +40,12 @@ repos:
     # https://github.com/hadolint/hadolint/issues/497
     - --ignore=DL3042
 
-- repo: https://github.com/PyCQA/pylint
-  # Note: pre-commit autoupdate changes to an alpha version. Instead, manually find the
-  # latest stable version here: https://github.com/pylint-dev/pylint/releases
-  rev: v3.2.6
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: v0.8.6
   hooks:
-  - id: pylint
+    # Run the linter.
+    - id: ruff
+      args: [ --fix ]
+    # Run the formatter.
+    - id: ruff-format

container/compose.yml

@@ -143,10 +143,7 @@ services:
       - ../tests:/opt/karapace/tests
       - ../pytest.ini:/opt/karapace/pytest.ini
       - ../mypy.ini:/opt/karapace/mypy.ini
-      - ../.flake8:/opt/karapace/.flake8
-      - ../.isort.cfg:/opt/karapace/.isort.cfg
       - ../.pre-commit-config.yaml:/opt/karapace/.pre-commit-config.yaml
-      - ../.pylintrc:/opt/karapace/.pylintrc
       - ../.coveragerc:/opt/karapace/.coveragerc
       - ../.coverage.3.10:/opt/karapace/coverage/.coverage.3.10
       - ../.coverage.3.11:/opt/karapace/coverage/.coverage.3.11

container/healthcheck.py

@@ -2,6 +2,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from __future__ import annotations
 
 from http import HTTPStatus

performance-test/rest-proxy-produce-consume-test.py

@@ -2,6 +2,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from kafka.admin import KafkaAdminClient, NewTopic
 from kafka.errors import TopicAlreadyExistsError
 from locust import FastHttpUser, task

performance-test/schema-registry-schema-post.py

@@ -2,6 +2,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from dataclasses import dataclass, field
 from locust import FastHttpUser, task
 from locust.contrib.fasthttp import ResponseContextManager

pyproject.toml

@@ -80,6 +80,7 @@ ujson = ["ujson"]
 dev = [
   # Developer QoL
   "pdbpp",
+  "ruff",
 
   # testing
   "filelock",
@@ -112,6 +113,5 @@ include-package-data = true
 [tool.setuptools_scm]
 version_file = "src/karapace/version.py"
 
-[tool.black]
-target-version = ["py310", "py311"]
+[tool.ruff]
 line-length = 125

setup.py

@@ -3,6 +3,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from setuptools import Extension, setup
 
 setup(

src/karapace/anonymize_schemas/anonymize_avro.py

@@ -4,6 +4,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from typing import Any, TypeAlias, Union
 
 import hashlib
@@ -98,7 +99,7 @@ def anonymize_element(m: re.Match) -> str:
 
 
 def anonymize(input_schema: Schema) -> Schema:
-    if not input_schema:  # pylint: disable=no-else-return
+    if not input_schema:
         return input_schema
     elif isinstance(input_schema, str):
         if input_schema in ALL_TYPES:

src/karapace/auth.py

@@ -2,6 +2,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from __future__ import annotations
 
 from base64 import b64encode
@@ -98,29 +99,23 @@ class AuthData(TypedDict):
 
 
 class AuthenticateProtocol(Protocol):
-    def authenticate(self, *, username: str, password: str) -> User | None:
-        ...
+    def authenticate(self, *, username: str, password: str) -> User | None: ...
 
 
 class AuthorizeProtocol(Protocol):
-    def get_user(self, username: str) -> User | None:
-        ...
+    def get_user(self, username: str) -> User | None: ...
 
-    def check_authorization(self, user: User | None, operation: Operation, resource: str) -> bool:
-        ...
+    def check_authorization(self, user: User | None, operation: Operation, resource: str) -> bool: ...
 
-    def check_authorization_any(self, user: User | None, operation: Operation, resources: list[str]) -> bool:
-        ...
+    def check_authorization_any(self, user: User | None, operation: Operation, resources: list[str]) -> bool: ...
 
 
 class AuthenticatorAndAuthorizer(AuthenticateProtocol, AuthorizeProtocol):
     MUST_AUTHENTICATE: bool = True
 
-    async def close(self) -> None:
-        ...
+    async def close(self) -> None: ...
 
-    async def start(self, stats: StatsClient) -> None:  # pylint: disable=unused-argument
-        ...
+    async def start(self, stats: StatsClient) -> None: ...
 
 
 class NoAuthAndAuthz(AuthenticatorAndAuthorizer):
@@ -241,7 +236,7 @@ async def _refresh_authfile() -> None:
                 except asyncio.CancelledError:
                     log.info("Closing schema registry ACL refresh task")
                     return
-                except Exception as ex:  # pylint: disable=broad-except
+                except Exception as ex:
                     log.exception("Schema registry auth file could not be loaded")
                     stats.unexpected_exception(ex=ex, where="schema_registry_authfile_reloader")
                     return

src/karapace/avro_dataclasses/introspect.py

@@ -20,16 +20,13 @@
     from _typeshed import DataclassInstance
 else:
 
-    class DataclassInstance:
-        ...
+    class DataclassInstance: ...
 
 
-class UnsupportedAnnotation(NotImplementedError):
-    ...
+class UnsupportedAnnotation(NotImplementedError): ...
 
 
-class UnderspecifiedAnnotation(UnsupportedAnnotation):
-    ...
+class UnderspecifiedAnnotation(UnsupportedAnnotation): ...
 
 
 def _field_type_array(field: Field, origin: type, type_: object) -> AvroType:
@@ -60,7 +57,7 @@ def _field_type_array(field: Field, origin: type, type_: object) -> AvroType:
 sequence_types: Final = frozenset({tuple, list, Sequence})
 
 
-def _field_type(field: Field, type_: object) -> AvroType:  # pylint: disable=too-many-return-statements
+def _field_type(field: Field, type_: object) -> AvroType:
     # Handle primitives.
     if type_ is bool:
         return "boolean"

src/karapace/avro_dataclasses/models.py

@@ -2,6 +2,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from __future__ import annotations
 
 from .introspect import record_schema
@@ -22,8 +23,7 @@
     from _typeshed import DataclassInstance
 else:
 
-    class DataclassInstance:
-        ...
+    class DataclassInstance: ...
 
 
 __all__ = ("AvroModel",)
@@ -76,8 +76,6 @@ def parse(value: object) -> object:
 
 
 def from_avro_value(type_: object) -> Parser | None:
-    # pylint: disable=too-many-return-statements
-
     if isinstance(type_, type):
         if is_dataclass(type_):
             return partial(from_avro_dict, type_)

src/karapace/avro_dataclasses/schema.py

@@ -2,6 +2,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from __future__ import annotations
 
 from collections.abc import Mapping

src/karapace/backup/api.py

@@ -4,6 +4,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from __future__ import annotations
 
 from .backends.reader import BaseBackupReader, BaseItemsBackupReader, ProducerSend, RestoreTopic, RestoreTopicLegacy
@@ -170,7 +171,7 @@ def before_sleep(it: RetryCallState) -> None:
             result = f"failed ({outcome.exception()})"
         else:
             result = f"returned {outcome.result()!r}"
-        LOG.info(f"{description} {result}, retrying... (Ctrl+C to abort)")  # pylint: disable=logging-fstring-interpolation
+        LOG.info(f"{description} {result}, retrying... (Ctrl+C to abort)")
 
     return before_sleep
 

src/karapace/backup/backends/reader.py

@@ -2,6 +2,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from __future__ import annotations
 
 from collections.abc import Callable, Generator, Iterator, Mapping, Sequence
@@ -78,8 +79,7 @@ def __init__(
 
     @staticmethod
     @abc.abstractmethod
-    def items_from_file(fp: IO[str]) -> Iterator[Sequence[str]]:
-        ...
+    def items_from_file(fp: IO[str]) -> Iterator[Sequence[str]]: ...
 
     def read(
         self,

src/karapace/backup/backends/v1.py

@@ -2,6 +2,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from __future__ import annotations
 
 from collections.abc import Generator

src/karapace/backup/backends/v2.py

@@ -2,6 +2,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from __future__ import annotations
 
 from collections.abc import Generator, Sequence

src/karapace/backup/backends/v3/backend.py

@@ -2,6 +2,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from __future__ import annotations
 
 from .checksum import RunningChecksum

src/karapace/backup/backends/v3/checksum.py

@@ -2,14 +2,13 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from __future__ import annotations
 
 from typing import Protocol
 
 
 class RunningChecksum(Protocol):
-    def update(self, data: bytes) -> None:
-        ...
+    def update(self, data: bytes) -> None: ...
 
-    def digest(self) -> bytes:
-        ...
+    def digest(self) -> bytes: ...

src/karapace/backup/backends/v3/constants.py

@@ -2,6 +2,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from typing import Final
 
 V3_MARKER: Final = b"/V3\n"

src/karapace/backup/backends/v3/readers.py

@@ -2,6 +2,7 @@
 Copyright (c) 2023 Aiven Ltd
 See LICENSE for details
 """
+
 from __future__ import annotations
 
 from .checksum import RunningChecksum