Use ruff instead of black, flake8, isort

Also, reorder sections in pyproject.toml.

Signed-off-by: Nils Philippsen <[email protected]>

.github/workflows/main.yaml

@@ -15,7 +15,7 @@ jobs:
 
       - name: Execute tox
         run: |
-          tox -e black,flake8,isort,poetry
+          tox -e format,lint,poetry
 
   ci-unittests:
     strategy:

duffy/api_models/__init__.py

@@ -1,22 +1,22 @@
-from .common import APIResult, APIResultAction  # noqa: F401
-from .node import NodeCreateModel, NodeModel, NodeResult, NodeResultCollection  # noqa: F401
-from .pool import (  # noqa: F401
+from .common import APIResult, APIResultAction
+from .node import NodeCreateModel, NodeModel, NodeResult, NodeResultCollection
+from .pool import (
     PoolConciseModel,
     PoolLevelsModel,
     PoolModel,
     PoolResult,
     PoolResultCollection,
     PoolVerboseModel,
 )
-from .session import (  # noqa: F401
+from .session import (
     SessionCreateModel,
     SessionModel,
     SessionNodeModel,
     SessionResult,
     SessionResultCollection,
     SessionUpdateModel,
 )
-from .tenant import (  # noqa: F401
+from .tenant import (
     TenantCreateModel,
     TenantCreateResult,
     TenantCreateResultModel,

duffy/app/controllers/session.py

@@ -1,4 +1,5 @@
 """This is the session controller."""
+
 import datetime as dt
 import logging
 from typing import Optional

duffy/client/__init__.py

@@ -1,2 +1,2 @@
-from .formatter import DuffyFormatter  # noqa: F401
-from .main import DuffyClient  # noqa: F401
+from .formatter import DuffyFormatter
+from .main import DuffyClient

duffy/configuration/__init__.py

@@ -1 +1 @@
-from .main import config, config_get, read_configuration  # noqa: F401
+from .main import config, config_get, read_configuration

duffy/configuration/validation.py

@@ -84,9 +84,9 @@ class RetriesModel(ConfigBaseModel):
     delay_backoff_factor: Optional[
         Union[Annotated[int, Field(ge=1)], Annotated[float, Field(ge=1)]]
     ] = Field(alias="delay-backoff-factor", default=None)
-    delay_add_fuzz: Optional[
-        Union[Annotated[int, Field(ge=0)], Annotated[float, Field(ge=0)]]
-    ] = Field(alias="delay-add-fuzz", default=None)
+    delay_add_fuzz: Optional[Union[Annotated[int, Field(ge=0)], Annotated[float, Field(ge=0)]]] = (
+        Field(alias="delay-add-fuzz", default=None)
+    )
 
 
 class DefaultsModel(ConfigBaseModel):

duffy/database/migrations/versions/36cf064c0481_ignore_failed_nodes_in_unique_indexes.py

@@ -4,6 +4,7 @@
 Revises: ce2e575cb800
 Create Date: 2023-07-27 11:29:37.405520
 """
+
 import sqlalchemy as sa
 from alembic import op
 

duffy/database/migrations/versions/6654d536b836_add_node_state_sessionnode_session_id_.py

@@ -4,6 +4,7 @@
 Revises: 36cf064c0481
 Create Date: 2023-09-06 21:42:56.647045
 """
+
 from alembic import op
 
 # revision identifiers, used by Alembic.

duffy/database/migrations/versions/ce2e575cb800_add_tenant_session_lifetimes.py

@@ -4,6 +4,7 @@
 Revises:
 Create Date: 2022-05-09 16:40:06.491392
 """
+
 import sqlalchemy as sa
 from alembic import op
 

duffy/database/model/__init__.py

@@ -1,3 +1,3 @@
-from .node import Node, SessionNode  # noqa: F401
-from .session import Session  # noqa: F401
-from .tenant import Tenant  # noqa: F401
+from .node import Node, SessionNode
+from .session import Session
+from .tenant import Tenant

duffy/nodes/mechanisms/__init__.py

@@ -1,2 +1,2 @@
-from . import ansible, main  # noqa: F401
-from .main import Mechanism, MechanismFailure  # noqa: F401
+from . import ansible, main
+from .main import Mechanism, MechanismFailure

duffy/tasks/__init__.py

@@ -1,5 +1,5 @@
-from .base import celery, init_tasks  # noqa: F401
-from .deprovision import deprovision_nodes, deprovision_pool_nodes  # noqa: F401
-from .expire import expire_sessions  # noqa: F401
-from .main import start_worker  # noqa: F401
-from .provision import fill_pools, fill_single_pool  # noqa: F401
+from .base import celery, init_tasks
+from .deprovision import deprovision_nodes, deprovision_pool_nodes
+from .expire import expire_sessions
+from .main import start_worker
+from .provision import fill_pools, fill_single_pool