Replace black+isort+autoflake8 with ruff format

dolfinus · dolfinus · commit 27ff11405e11 · 2025-12-26T15:52:35.000+03:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -59,26 +59,6 @@ repos:
       - id: pyupgrade
         args: [--py311-plus, --keep-runtime-typing]
 
-  - repo: https://github.com/asottile/add-trailing-comma
-    rev: v4.0.0
-    hooks:
-      - id: add-trailing-comma
-
-  - repo: https://github.com/pycqa/autoflake
-    rev: v2.3.1
-    hooks:
-      - id: autoflake
-        args:
-          - --in-place
-          - --remove-all-unused-imports
-          - --remove-unused-variables
-          - --ignore-init-module-imports
-
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.12.0
-    hooks:
-      - id: black
-
   - repo: https://github.com/pycqa/bandit
     rev: 1.9.2
     hooks:
@@ -89,11 +69,10 @@ repos:
           - -ll
         require_serial: true
 
-  - repo: https://github.com/pycqa/isort
-    rev: 7.0.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.14.10
     hooks:
-      - id: isort
-        name: isort (python)
+      - id: ruff-format
 
   - repo: local
     hooks:
diff --git a/pyproject.toml b/pyproject.toml
@@ -108,7 +108,6 @@ test = [
 dev = [
     "mypy~=1.19.1",
     "pre-commit~=4.5.0",
-    "black~=25.12.0",
     "flake8~=7.3.0",
     "flake8-pyproject~=1.2.3",
     "sqlalchemy[mypy]~=2.0.44",
@@ -133,13 +132,10 @@ docs = [
   # sphinx-plantuml~=1.0.0",
 ]
 
-[tool.black]
+[tool.ruff]
+target-version = "py311"
 line-length = 120
-
-[tool.isort]
-profile = "black"
-py_version = "311"
-known_first_party = ["app"]
+extend-exclude = ["docs/", "Makefile"]
 
 [tool.mypy]
 python_version = "3.11"
diff --git a/syncmaster/db/migrations/versions/2024-10-07_0010_add_pg_trgm_extension.py b/syncmaster/db/migrations/versions/2024-10-07_0010_add_pg_trgm_extension.py
@@ -7,6 +7,7 @@
 Create Date: 2024-10-07 06:59:12.667067
 
 """
+
 from alembic import op
 
 # revision identifiers, used by Alembic.
diff --git a/syncmaster/db/migrations/versions/2024-11-01_0011_create_apscheduler_table.py b/syncmaster/db/migrations/versions/2024-11-01_0011_create_apscheduler_table.py
@@ -7,6 +7,7 @@
 Create Date: 2024-11-01 08:37:47.078657
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/syncmaster/db/models/connection.py b/syncmaster/db/models/connection.py
@@ -70,7 +70,7 @@ class Connection(Base, ResourceMixin, TimestampMixin):
     )
 
     def __repr__(self):
-        return f"<Connection " f"name={self.name} " f"description={self.description} " f"group_id={self.group_id}>"
+        return f"<Connection name={self.name} description={self.description} group_id={self.group_id}>"
 
     @declared_attr
     def __table_args__(cls) -> tuple:
diff --git a/syncmaster/exceptions/transfer.py b/syncmaster/exceptions/transfer.py
@@ -34,6 +34,4 @@ def __init__(
 
     @property
     def message(self) -> str:
-        return (
-            f"{self.conn} connection has type `{self.connection_type}` " f"but its params has `{self.params_type}` type"
-        )
+        return f"{self.conn} connection has type `{self.connection_type}` but its params has `{self.params_type}` type"
diff --git a/syncmaster/schemas/v1/auth/mixins.py b/syncmaster/schemas/v1/auth/mixins.py
@@ -4,7 +4,6 @@
 
 
 class SecretDumpMixin(BaseModel):
-
     @field_serializer("*", when_used="json")
     def dump_secrets(self, value):
         if isinstance(value, SecretStr):
diff --git a/syncmaster/settings/broker.py b/syncmaster/settings/broker.py
@@ -23,7 +23,7 @@ class RabbitMQSettings(BaseModel):
 
     url: str = Field(
         description=(
-            "RabbitMQ connection URL.\n\n" "See the `RabbitMQ documentation <https://www.rabbitmq.com/uri-spec.html>`_ "
+            "RabbitMQ connection URL.\n\nSee the `RabbitMQ documentation <https://www.rabbitmq.com/uri-spec.html>`_ "
         ),
     )
 
diff --git a/syncmaster/worker/base.py b/syncmaster/worker/base.py
@@ -7,7 +7,6 @@
 
 
 class WorkerTask(Task):
-
     def __init__(self) -> None:
         self.settings = Settings()
         self.engine = create_engine(
diff --git a/syncmaster/worker/handlers/db/base.py b/syncmaster/worker/handlers/db/base.py
@@ -39,9 +39,7 @@ def read(self) -> DataFrame:
         reader_params = {}
         if self.transfer_dto.strategy.type == "incremental":
             self.transfer_dto.strategy.increment_by = self._quote_field(self.transfer_dto.strategy.increment_by)
-            hwm_name = (
-                f"{self.transfer_dto.id}_{self.connection_dto.type}_{self.transfer_dto.table_name}"  # noqa: WPS237
-            )
+            hwm_name = f"{self.transfer_dto.id}_{self.connection_dto.type}_{self.transfer_dto.table_name}"  # noqa: WPS237
             reader_params["hwm"] = DBReader.AutoDetectHWM(
                 name=hwm_name,
                 expression=self.transfer_dto.strategy.increment_by,
diff --git a/syncmaster/worker/handlers/file/local_df.py b/syncmaster/worker/handlers/file/local_df.py
@@ -17,15 +17,12 @@
 
 
 class LocalDFFileHandler(FileHandler):
-
     def read(self) -> DataFrame:
         from pyspark.sql.types import StructType
 
         downloader_params = {}
         if self.transfer_dto.strategy.type == "incremental":
-            hwm_name = (
-                f"{self.transfer_dto.id}_{self.connection_dto.type}_{self.transfer_dto.directory_path}"  # noqa: WPS237
-            )
+            hwm_name = f"{self.transfer_dto.id}_{self.connection_dto.type}_{self.transfer_dto.directory_path}"  # noqa: WPS237
             if self.transfer_dto.strategy.increment_by == "file_modified_since":
                 downloader_params["hwm"] = FileModifiedTimeHWM(name=hwm_name)
             elif self.transfer_dto.strategy.increment_by == "file_name":
@@ -60,7 +57,6 @@ def read(self) -> DataFrame:
         return df
 
     def write(self, df: DataFrame) -> None:
-
         writer = FileDFWriter(
             connection=self.local_df_connection,
             format=self.transfer_dto.file_format,
diff --git a/syncmaster/worker/handlers/file/remote_df.py b/syncmaster/worker/handlers/file/remote_df.py
@@ -15,7 +15,6 @@
 
 
 class RemoteDFFileHandler(FileHandler):
-
     def read(self) -> DataFrame:
         from pyspark.sql.types import StructType
 
diff --git a/tests/resources/file_df_connection/generate_data.py b/tests/resources/file_df_connection/generate_data.py
@@ -39,14 +39,9 @@ def calculate_intravals(elements: int, parts: int):
 
 
 def generate_data_file(elements: int, parts: int):
-    from black import FileMode, format_str
-
     data = create_data(elements)
     with open("test_data.py", "w") as f:
-        data_to_write = format_str(
-            f"import datetime\nintervals={calculate_intravals(elements, parts)}\ndata={data}",
-            mode=FileMode(line_length=120),
-        )
+        data_to_write = f"import datetime\nintervals={calculate_intravals(elements, parts)}\ndata={data}"
         f.write(data_to_write)
 
 
diff --git a/tests/test_unit/conftest.py b/tests/test_unit/conftest.py
@@ -274,20 +274,23 @@ async def two_group_connections(
         connection_id=connection2.id,
     )
 
-    yield MockConnection(
-        credentials=MockCredentials(
-            value=decrypt_auth_data(credentials1.value, settings=settings),
-            connection_id=connection1.id,
+    yield (
+        MockConnection(
+            credentials=MockCredentials(
+                value=decrypt_auth_data(credentials1.value, settings=settings),
+                connection_id=connection1.id,
+            ),
+            connection=connection1,
+            owner_group=mock_group,
         ),
-        connection=connection1,
-        owner_group=mock_group,
-    ), MockConnection(
-        credentials=MockCredentials(
-            value=decrypt_auth_data(credentials2.value, settings=settings),
-            connection_id=connection2.id,
+        MockConnection(
+            credentials=MockCredentials(
+                value=decrypt_auth_data(credentials2.value, settings=settings),
+                connection_id=connection2.id,
+            ),
+            connection=connection2,
+            owner_group=mock_group,
         ),
-        connection=connection2,
-        owner_group=mock_group,
     )
     await session.delete(connection1)
     await session.delete(connection2)
diff --git a/tests/test_unit/test_auth/test_oauth2_gateway.py b/tests/test_unit/test_auth/test_oauth2_gateway.py
@@ -27,7 +27,6 @@ async def test_get_keycloak_token_active(
     settings: Settings,
     mock_keycloak_introspect_token,
 ):
-
     mock_keycloak_introspect_token(simple_user)
 
     headers = {
diff --git a/tests/test_unit/test_connections/connection_fixtures/group_connections_fixture.py b/tests/test_unit/test_connections/connection_fixtures/group_connections_fixture.py
@@ -20,7 +20,6 @@ async def group_connections(
 
     # since group_connection already created a connection, we start from index 1
     for conn_type in connection_types[1:]:
-
         new_data = {
             **connection.data,
         }
diff --git a/tests/test_unit/test_groups/test_read_groups.py b/tests/test_unit/test_groups/test_read_groups.py
@@ -220,7 +220,6 @@ async def test_search_groups_with_query(
     search_value: str,
     expected_total: int,
 ):
-
     response = await client.get(
         "v1/groups",
         headers={"Authorization": f"Bearer {user_with_many_roles.token}"},
diff --git a/tests/utils.py b/tests/utils.py
@@ -187,7 +187,6 @@ async def run_transfer_and_verify(
 
 
 def cast_dataframe_types(df: DataFrame, init_df: DataFrame) -> tuple[DataFrame, DataFrame]:
-
     for field in init_df.schema:
         df = df.withColumn(field.name, df[field.name].cast(field.dataType))
 
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class Connection(Base, ResourceMixin, TimestampMixin):`
`70`	`70`	`)`
`71`	`71`
`72`	`72`	`def __repr__(self):`
`73`		`- return f"<Connection " f"name={self.name} " f"description={self.description} " f"group_id={self.group_id}>"`
	`73`	`+ return f"<Connection name={self.name} description={self.description} group_id={self.group_id}>"`
`74`	`74`
`75`	`75`	`@declared_attr`
`76`	`76`	`def __table_args__(cls) -> tuple:`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class RabbitMQSettings(BaseModel):`
`23`	`23`
`24`	`24`	`url: str = Field(`
`25`	`25`	`description=(`
`26`		- "RabbitMQ connection URL.\n\n" "See the `RabbitMQ documentation <https://www.rabbitmq.com/uri-spec.html>`_ "
	`26`	+ "RabbitMQ connection URL.\n\nSee the `RabbitMQ documentation <https://www.rabbitmq.com/uri-spec.html>`_ "
`27`	`27`	`),`
`28`	`28`	`)`
`29`	`29`