chore: add more ruff with autofixes (#644)

* chore: add more ruff with autofixes

Signed-off-by: Henry Schreiner <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Henry Schreiner <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: henryiii

pyproject.toml

@@ -168,6 +168,15 @@ extend-select = [
     "PD", # pandas-vet
     "FURB", # refurb
     "PYI", # flake8-pyi
+    "BLE", # flake8-blind-except
+    "FA", # flake8-future-annotations
+    "FLY", # flynt
+    "ISC", # flake8-implicit-str-concat
+    "Q", # flake8-quotes
+    "RSE", # flake8-raise
+    "SLOT", # flake8-slots
+    "T10", # flake8-debugger
+    "TC", # flake8-type-checking
 ]
 ignore = [
   "PLR09",    # Too many <...>
@@ -186,3 +195,4 @@ ignore = [
 "docs/conf.py" = ["T20"]
 "src/mplhep/_dev.py" = ["T20"]
 "test_*.py" = ["T20"]
+"src/mplhep/styles/*.py" = ["FLY002"]

src/mplhep/_dev.py

@@ -4,6 +4,8 @@
 Usage: ./dev [command] [options] or ./dev for interactive mode
 """
 
+from __future__ import annotations
+
 import argparse
 import datetime
 import importlib.util
@@ -14,7 +16,6 @@
 import subprocess
 import sys
 from pathlib import Path
-from typing import Optional
 
 try:
     import questionary
@@ -99,7 +100,7 @@ def _run_command_with_confirmation(
 
         return self._run_command(cmd)
 
-    def _run_command(self, cmd: list[str], cwd: Optional[Path] = None) -> bool:
+    def _run_command(self, cmd: list[str], cwd: Path | None = None) -> bool:
         """Run a command and return True if successful."""
         try:
             self._print_header(f"Running: {' '.join(cmd)}")
@@ -178,10 +179,10 @@ def _find_files_to_clean(self) -> list[Path]:
 
     def cmd_test(
         self,
-        jobs: Optional[int] = None,
-        filter_pattern: Optional[str] = None,
+        jobs: int | None = None,
+        filter_pattern: str | None = None,
         skip_cleanup: bool = False,
-        extra_args: Optional[list[str]] = None,
+        extra_args: list[str] | None = None,
     ) -> bool:
         """Run pytest with matplotlib comparison."""
         if jobs is None:
@@ -282,7 +283,7 @@ def cmd_baseline(self) -> bool:
 
         return success
 
-    def cmd_precommit(self, extra_args: Optional[list[str]] = None) -> bool:
+    def cmd_precommit(self, extra_args: list[str] | None = None) -> bool:
         """Run pre-commit hooks on all files."""
         self._print_header("Running Pre-commit Hooks")
 
@@ -351,7 +352,7 @@ def cmd_docs(
         port: int = 8000,
         clean: bool = True,
         fast: bool = False,
-        extra_args: Optional[list[str]] = None,
+        extra_args: list[str] | None = None,
     ) -> bool:
         """Build or serve documentation."""
         # Check if mkdocs is available
@@ -372,7 +373,7 @@ def cmd_docs(
         return False
 
     def _build_docs(
-        self, clean: bool, fast: bool, extra_args: Optional[list[str]] = None
+        self, clean: bool, fast: bool, extra_args: list[str] | None = None
     ) -> bool:
         """Build documentation."""
         if fast:
@@ -411,7 +412,7 @@ def _build_docs(
         return success
 
     def _serve_docs(
-        self, port: int, fast: bool, extra_args: Optional[list[str]] = None
+        self, port: int, fast: bool, extra_args: list[str] | None = None
     ) -> bool:
         """Serve documentation locally."""
         if fast:
@@ -489,8 +490,8 @@ def cmd_clean(self) -> bool:
     def cmd_benchmark(
         self,
         action: str = "run",
-        baseline_name: Optional[str] = None,
-        compare_with: Optional[str] = None,
+        baseline_name: str | None = None,
+        compare_with: str | None = None,
     ) -> bool:
         """Run performance benchmarks."""
         # Check if pytest-benchmark is available
@@ -523,7 +524,7 @@ def _check_benchmark_available(self) -> bool:
         self._print_warning("Install with: pip install pytest-benchmark")
         return False
 
-    def _run_benchmarks(self, baseline_name: Optional[str] = None) -> bool:
+    def _run_benchmarks(self, baseline_name: str | None = None) -> bool:
         """Run benchmark tests."""
         # Build benchmark command
         cmd = [
@@ -562,7 +563,7 @@ def _run_benchmarks(self, baseline_name: Optional[str] = None) -> bool:
 
         return success
 
-    def _compare_benchmarks(self, compare_with: Optional[str] = None) -> bool:
+    def _compare_benchmarks(self, compare_with: str | None = None) -> bool:
         """Compare current benchmarks with a baseline."""
         benchmark_dir = self.project_root / "tests" / "baseline" / "benchmark"
 
@@ -808,7 +809,7 @@ def _get_style(self):
 
     def _get_text_input(
         self, prompt: str, default: str = "", fallback_prompt: str = ""
-    ) -> Optional[str]:
+    ) -> str | None:
         """Get text input with questionary or basic fallback."""
         if HAS_QUESTIONARY and questionary is not None:
             return questionary.text(prompt, default=default, style=self.style).ask()
@@ -823,7 +824,7 @@ def _get_text_input(
 
     def _get_choice(
         self, prompt: str, choices: list[tuple], fallback_prompt: str = ""
-    ) -> Optional[str]:
+    ) -> str | None:
         """Get choice selection with questionary or basic fallback."""
         if HAS_QUESTIONARY and questionary is not None:
             choice_objects = [

src/mplhep/_utils.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from collections.abc import Iterable, Sequence
 from numbers import Real
 from typing import TYPE_CHECKING, Any
 
@@ -13,7 +12,7 @@
 from uhi.typing.plottable import PlottableAxis, PlottableHistogram
 
 if TYPE_CHECKING:
-    pass
+    from collections.abc import Iterable, Sequence
 
 ArrayLike = Any
 

src/mplhep/label.py

@@ -913,9 +913,9 @@ def exp_label(
         # Build label following main branch logic
         _label = text
         if supp:  # If supp is truthy, prepend "Supplementary"
-            _label = " ".join(["Supplementary", _label])
+            _label = f"Supplementary {_label}"
         if not data:
-            _label = " ".join(["Simulation", _label])
+            _label = f"Simulation {_label}"
         # Clean up extra whitespace
         llabel = " ".join(_label.split())
 
@@ -1013,7 +1013,7 @@ def _normalize_labels(labels_input):
     # At this point, labels is guaranteed to be list[tuple[str, str]]
     tuple_labels: list[tuple[str, str]] = labels  # type: ignore[assignment]
     for label_text, suffix in tuple_labels:
-        label_base.set_text(" ".join([_sim, label_text]).lstrip())
+        label_base.set_text(f"{_sim} {label_text}".lstrip())
 
         def _construct_filename(base_fname: str, suffix: str) -> str:
             """Construct output filename from base name and suffix."""