update ruff settings

Author: snopoke

examples/demo.py

@@ -15,15 +15,9 @@ def main(args):
     tb.init(args.org, args.project, args.key)
     actions = []
     if args.email:
-        actions = [
-            tb.Action(
-                "*/10%,success,error", integration=EmailIntegration(to=args.email)
-            )
-        ]
+        actions = [tb.Action("*/10%,success,error", integration=EmailIntegration(to=args.email))]
 
-    task = tb.Task.create(
-        args.task_name, data={"host": os.uname().nodename}, actions=actions
-    )
+    task = tb.Task.create(args.task_name, data={"host": os.uname().nodename}, actions=actions)
 
     context = prepare_migration()
 
@@ -47,12 +41,8 @@ def perform_migration(context, task: tb.Task):
 if __name__ == "__main__":
     parser = argparse.ArgumentParser("Demo database migration")
     parser.add_argument("task_name")
-    parser.add_argument(
-        "-o", "--org", required=True, help="Taskbadger Organization slug"
-    )
-    parser.add_argument(
-        "-p", "--project", required=True, help="Taskbadger Project slug"
-    )
+    parser.add_argument("-o", "--org", required=True, help="Taskbadger Organization slug")
+    parser.add_argument("-p", "--project", required=True, help="Taskbadger Project slug")
     parser.add_argument("-k", "--key", required=True, help="Taskbadger API Key")
     parser.add_argument("-e", "--email")
     args = parser.parse_args()

integration_tests/__init__.py

@@ -33,6 +33,4 @@ def _load_config():
         os.environ.get("TASKBADGER_API_KEY", ""),
         systems=[CelerySystemIntegration()],
     )
-    print(
-        f"\nIntegration tests configuration:\n    {badger.mug.Badger.current.settings}\n"
-    )
+    print(f"\nIntegration tests configuration:\n    {badger.mug.Badger.current.settings}\n")

integration_tests/tasks.py

@@ -12,7 +12,5 @@ def add(self, x, y):
 
 @shared_task(bind=True)
 def add_auto_track(self, x, y):
-    assert (
-        self.request.taskbadger_task_id is not None
-    ), "missing task ID on self.request"
+    assert self.request.taskbadger_task_id is not None, "missing task ID on self.request"
     return x + y

integration_tests/test_celery.py

@@ -9,14 +9,10 @@
 
 
 @pytest.fixture(autouse=True)
-def check_log_errors(caplog):
+def _check_log_errors(caplog):
     yield
     for when in ("call", "setup", "teardown"):
-        errors = [
-            r.getMessage()
-            for r in caplog.get_records(when)
-            if r.levelno == logging.ERROR
-        ]
+        errors = [r.getMessage() for r in caplog.get_records(when) if r.levelno == logging.ERROR]
         if errors:
             pytest.fail(f"log errors during '{when}': {errors}")
 

pyproject.toml

@@ -69,23 +69,28 @@ dev = [
 [project.scripts]
 taskbadger = "taskbadger.cli_main:app"
 
-[tool.black]
-line-length = 120
-target_version = ['py37', 'py38', 'py39']
-exclude = '''
-(
-  /(
-    | \.git
-    | \.venv
-    | \.mypy_cache
-  )/
-)
-'''
-
-[tool.isort]
-line_length = 120
-profile = "black"
-
 [tool.pytest.ini_options]
 # don't run integration tests unless specifically requested
 norecursedirs = ".* integration_tests"
+
+[tool.ruff]
+exclude = [
+    ".venv",
+    ".git",
+    ".ruff_cache",
+]
+line-length = 120
+indent-width = 4
+target-version = "py39"
+
+[tool.ruff.lint]
+select = ["E", "F", "I", "UP", "DJ", "PT"]
+fixable = ["ALL"]
+unfixable = []
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "auto"

taskbadger/celery.py

@@ -130,9 +130,7 @@ def apply_async(self, *args, **kwargs):
         tb_task_id = result.info.get(TB_TASK_ID) if result.info else None
         setattr(result, TB_TASK_ID, tb_task_id)
 
-        _get_task = (
-            functools.partial(get_task, tb_task_id) if tb_task_id else lambda: None
-        )
+        _get_task = functools.partial(get_task, tb_task_id) if tb_task_id else lambda: None
         setattr(result, "get_taskbadger_task", _get_task)
 
         return result

taskbadger/cli/__init__.py

@@ -2,5 +2,4 @@
 from .list_tasks import list_tasks_command
 from .wrapper import run
 
-
 __all__ = ["create", "get", "update", "list_tasks_command", "run"]

taskbadger/cli/basics.py

@@ -1,7 +1,6 @@
 import csv
 import json
 import sys
-from typing import Tuple
 
 import typer
 from rich import print
@@ -19,9 +18,7 @@
 def get(
     ctx: typer.Context,
     task_id: str = typer.Argument(..., show_default=False, help="The ID of the task."),
-    output_format: OutputFormat = typer.Option(
-        OutputFormat.pretty, "--format", "-f", help="Output format"
-    ),
+    output_format: OutputFormat = typer.Option(OutputFormat.pretty, "--format", "-f", help="Output format"),
 ):
     """Get a task."""
     configure_api(ctx)
@@ -52,17 +49,15 @@ def create(
     ctx: typer.Context,
     name: str = typer.Argument(..., show_default=False, help="The task name."),
     monitor_id: str = typer.Option(None, help="Associate this task with a monitor."),
-    action_def: Tuple[str, str, str] = typer.Option(
+    action_def: tuple[str, str, str] = typer.Option(
         (None, None, None),
         "--action",
         "-a",
         metavar="<trigger integration config>",
         show_default=False,
         help="Action definition e.g. 'success,error email to:me@email.com'",
     ),
-    status: StatusEnum = typer.Option(
-        StatusEnum.PROCESSING, help="The initial status of the task."
-    ),
+    status: StatusEnum = typer.Option(StatusEnum.PROCESSING, help="The initial status of the task."),
     value_max: int = typer.Option(100, help="The maximum value for the task."),
     metadata: list[str] = typer.Option(
         None,
@@ -74,9 +69,7 @@ def create(
         show_default=False,
         help="Metadata to associate with the task. Must be valid JSON.",
     ),
-    quiet: bool = typer.Option(
-        False, "--quiet", "-q", help="Minimal output. Only the Task ID."
-    ),
+    quiet: bool = typer.Option(False, "--quiet", "-q", help="Minimal output. Only the Task ID."),
 ):
     """Create a task."""
     configure_api(ctx)
@@ -103,29 +96,19 @@ def create(
 
 def update(
     ctx: typer.Context,
-    task_id: str = typer.Argument(
-        ..., show_default=False, help="The ID of the task to update."
-    ),
-    name: str = typer.Option(
-        None, show_default=False, help="Update the name of the task."
-    ),
-    action_def: Tuple[str, str, str] = typer.Option(
+    task_id: str = typer.Argument(..., show_default=False, help="The ID of the task to update."),
+    name: str = typer.Option(None, show_default=False, help="Update the name of the task."),
+    action_def: tuple[str, str, str] = typer.Option(
         (None, None, None),
         "--action",
         "-a",
         metavar="<trigger integration config>",
         show_default=False,
         help="Action definition e.g. 'success,error email to:me@email.com'",
     ),
-    status: StatusEnum = typer.Option(
-        StatusEnum.PROCESSING, help="The status of the task."
-    ),
-    value: int = typer.Option(
-        None, show_default=False, help="The current task value (progress)."
-    ),
-    value_max: int = typer.Option(
-        None, show_default=False, help="The maximum value for the task."
-    ),
+    status: StatusEnum = typer.Option(StatusEnum.PROCESSING, help="The status of the task."),
+    value: int = typer.Option(None, show_default=False, help="The current task value (progress)."),
+    value_max: int = typer.Option(None, show_default=False, help="The maximum value for the task."),
     metadata: list[str] = typer.Option(
         None,
         show_default=False,

taskbadger/cli/list_tasks.py

@@ -14,9 +14,7 @@
 
 def list_tasks_command(
     ctx: typer.Context,
-    output_format: OutputFormat = typer.Option(
-        OutputFormat.pretty, "--format", "-f", help="Output format"
-    ),
+    output_format: OutputFormat = typer.Option(OutputFormat.pretty, "--format", "-f", help="Output format"),
     limit: int = typer.Option(100, help="Limit the number of results."),
     start_token: str = typer.Option(None, show_default=False, help="Start token."),
 ):

taskbadger/cli/wrapper.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 import typer
 from rich import print
 
@@ -12,10 +10,8 @@ def run(
     ctx: typer.Context,
     name: str = typer.Argument(..., show_default=False, help="The task name"),
     monitor_id: str = typer.Option(None, help="Associate this task with a monitor."),
-    update_frequency: int = typer.Option(
-        5, metavar="SECONDS", min=5, max=300, help="Seconds between updates."
-    ),
-    action_def: Tuple[str, str, str] = typer.Option(
+    update_frequency: int = typer.Option(5, metavar="SECONDS", min=5, max=300, help="Seconds between updates."),
+    action_def: tuple[str, str, str] = typer.Option(
         (None, None, None),
         "--action",
         "-a",
@@ -71,9 +67,7 @@ def run(
             if process.returncode == 0:
                 task.success(value=100)
             else:
-                _update_task(
-                    task, status=StatusEnum.ERROR, return_code=process.returncode
-                )
+                _update_task(task, status=StatusEnum.ERROR, return_code=process.returncode)
 
     if process.returncode != 0:
         raise typer.Exit(process.returncode)
@@ -86,8 +80,6 @@ def _update_task(task, status=None, **data_kwargs):
 
     merge_strategy = DefaultMergeStrategy(append_keys=("stdout", "stderr"))
     try:
-        task.update(
-            status=status, data=data_kwargs or None, data_merge_strategy=merge_strategy
-        )
+        task.update(status=status, data=data_kwargs or None, data_merge_strategy=merge_strategy)
     except Exception as e:
         err_console.print(f"Error updating task status: {e!r}")