Merge pull request #238 from sandialabs/pre-commit-ci-update-config

ci: pre-commit auto-update

Author: jmgate

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ ci:
 repos:
 
     - repo: https://github.com/astral-sh/ruff-pre-commit
-      rev: v0.13.3
+      rev: v0.14.1
       hooks:
         - id: ruff-check
         - id: ruff-format

example/ex_6_creating_retryable_stages.py

@@ -14,7 +14,6 @@
 import sys
 from argparse import ArgumentParser
 from pathlib import Path
-from typing import Optional
 
 from staged_script import RetryStage, StagedScript
 
@@ -24,7 +23,7 @@ def __init__(
         self,
         stages: set[str],
         *,
-        console_force_terminal: Optional[bool] = None,
+        console_force_terminal: bool | None = None,
         console_log_path: bool = True,
         print_commands: bool = True,
     ) -> None:

example/ex_7_customizing_the_summary.py

@@ -16,7 +16,6 @@
 import sys
 from argparse import ArgumentParser
 from pathlib import Path
-from typing import Optional
 
 from staged_script import RetryStage, StagedScript
 
@@ -26,7 +25,7 @@ def __init__(
         self,
         stages: set[str],
         *,
-        console_force_terminal: Optional[bool] = None,
+        console_force_terminal: bool | None = None,
         console_log_path: bool = True,
         print_commands: bool = True,
     ) -> None:
@@ -147,7 +146,7 @@ def _end_stage_goodbye(self) -> None:
 
     def print_script_execution_summary(
         self,
-        extra_sections: Optional[dict[str, str]] = None,
+        extra_sections: dict[str, str] | None = None,
     ) -> None:
         extras = {
             "Machine details": (

staged_script/staged_script.py

@@ -26,7 +26,7 @@
 from datetime import datetime, timedelta, timezone
 from pathlib import Path
 from subprocess import CompletedProcess
-from typing import Any, Callable, NamedTuple, NoReturn, Optional
+from typing import Any, NamedTuple, NoReturn, TYPE_CHECKING
 
 import __main__
 import rich.traceback
@@ -40,6 +40,9 @@
 from tenacity.stop import stop_after_attempt, stop_after_delay
 from tenacity.wait import wait_fixed
 
+if TYPE_CHECKING:
+    from collections.abc import Callable  # pragma: no cover
+
 rich.traceback.install()
 
 
@@ -142,7 +145,7 @@ def __init__(
         self,
         stages: set[str],
         *,
-        console_force_terminal: Optional[bool] = None,
+        console_force_terminal: bool | None = None,
         console_log_path: bool = True,
         print_commands: bool = True,
     ) -> None:
@@ -787,7 +790,7 @@ def run(
         command: str,
         *,
         pretty_print: bool = False,
-        print_command: Optional[bool] = None,
+        print_command: bool | None = None,
         **kwargs: Any,  # noqa: ANN401
     ) -> CompletedProcess:
         """
@@ -865,7 +868,7 @@ def pretty_print_command(self, command: str, indent: int = 4) -> str:
     #
 
     def print_script_execution_summary(
-        self, extra_sections: Optional[dict[str, str]] = None
+        self, extra_sections: dict[str, str] | None = None
     ) -> None:
         """
         Print a summary of everything that was done by the script.
@@ -887,7 +890,7 @@ def print_script_execution_summary(
 
             def print_script_execution_summary(
                 self,
-                extra_sections: Optional[dict[str, str]] = None
+                extra_sections: dict[str, str] | None = None
             ) -> None:
                 extras = {"Additional section": "With some details."}
                 if extra_sections is not None:

test/test_staged_script.py

@@ -11,7 +11,6 @@
 import shlex
 from datetime import datetime, timedelta, timezone
 from subprocess import CompletedProcess
-from typing import Optional
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -254,7 +253,7 @@ def test_run_dry_run(
 )
 def test_print_script_execution_summary(
     mock_get_pretty_command_line_invocation: MagicMock,
-    extras: Optional[dict[str, str]],
+    extras: dict[str, str] | None,
     script_success: bool,  # noqa: FBT001
     script: StagedScript,
     capsys: pytest.CaptureFixture,