From 7f1d29a8cb998fca668dae2a6dbb48a73fd5e3ba Mon Sep 17 00:00:00 2001 From: perl_d Date: Fri, 7 Aug 2026 09:35:08 +0200 Subject: [PATCH] style: formatting and linting in affected files --- .gitea/workflows/ci.yml | 2 ++ pyproject.toml | 10 ++++------ src/aarecommon/config/logger.py | 2 +- src/aarecommon/math/coordinate.py | 1 - src/aarecommon/math/find_xtal.py | 8 +++----- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index b0f34e8..28a7f60 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,6 +16,8 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v5 + with: + fetch-depth: 0 - name: Setup uses: ./.gitea/actions/install diff --git a/pyproject.toml b/pyproject.toml index f621539..43f6b8c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,15 +54,13 @@ skip-magic-trailing-comma = true profile = "black" line_length = 100 multi_line_output = 3 +split-on-trailing-comma=false [tool.ruff] line-length = 100 +[tool.ruff.lint] +isort.split-on-trailing-comma=false + [tool.ruff.format] skip-magic-trailing-comma = true - -[dependency-groups] -dev = [ - "pytest>=9.1.1", - "pytest-asyncio>=1.4.0", -] diff --git a/src/aarecommon/config/logger.py b/src/aarecommon/config/logger.py index c7f0cec..64654e7 100644 --- a/src/aarecommon/config/logger.py +++ b/src/aarecommon/config/logger.py @@ -139,7 +139,7 @@ def find_existing_formatter( return logging.Formatter(default_fmt, datefmt=default_datefmt) -def attach_to_logger(logger_name: str = "", handler: logging.Handler | None = None): +def attach_to_logger(logger_name: str, handler: logging.Handler): logging.getLogger(logger_name).addHandler(handler) diff --git a/src/aarecommon/math/coordinate.py b/src/aarecommon/math/coordinate.py index 62a658a..996096b 100644 --- a/src/aarecommon/math/coordinate.py +++ b/src/aarecommon/math/coordinate.py @@ -1,4 +1,3 @@ - import numpy as np from pydantic import BaseModel diff --git a/src/aarecommon/math/find_xtal.py b/src/aarecommon/math/find_xtal.py index 04885ef..7a5413c 100644 --- a/src/aarecommon/math/find_xtal.py +++ b/src/aarecommon/math/find_xtal.py @@ -40,7 +40,7 @@ def rebuild_array_from_scan_results( ny_field: str = "ny", default_value: float = 0.0, threshold: float | None = None, - condition_func: Callable | None = None, + condition_func: Callable[[float], bool] | None = None, apply_filter_before: bool = True, ) -> np.ndarray: positions = [] @@ -403,7 +403,7 @@ def _draw_panel( import matplotlib.patches as mpatches import matplotlib.pyplot as plt - from aarecommon.coordinate import Coordinate + from aarecommon.math.coordinate import Coordinate n_nx, n_ny = arr.shape max_nx, max_ny = _max_cell(arr) @@ -570,9 +570,7 @@ CRYSTAL_METHOD_MAP: dict = { def compare_crystal_methods( - results: list, - arr: np.ndarray | None = None, - grid_size_mm: tuple[float, float] | None = None, + results: list, arr: np.ndarray | None = None, grid_size_mm: tuple[float, float] | None = None ) -> None: """Plot each crystal-detection method side-by-side for visual comparison.