Update pre-commit hooks

.pre-commit-config.yaml

@@ -8,20 +8,20 @@ repos:
     hooks:
       - id: yesqa
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.16.0
+    rev: v3.19.0
     hooks:
       - id: pyupgrade
         args: ['--py39-plus']
   - repo: https://github.com/ambv/black
-    rev: 24.4.2
+    rev: 24.10.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.0
+    rev: 7.1.1
     hooks:
       - id: flake8
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-ast
       - id: check-docstring-first
@@ -42,11 +42,11 @@ repos:
       - id: codespell
         exclude_types: [json]
   - repo: https://github.com/marco-c/taskcluster_yml_validator
-    rev: v0.0.11
+    rev: v0.0.12
     hooks:
       - id: taskcluster_yml
   - repo: https://github.com/MozillaSecurity/orion-ci
-    rev: v0.0.9
+    rev: v0.0.10
     hooks:
       - id: orion_ci
   - repo: meta

src/lithium/docs/examples/arithmetic/product_divides.py

@@ -6,10 +6,9 @@
 """This tests Lithium's main "minimize" algorithm."""
 
 import sys
-from typing import List
 
 
-def interesting(args: List[str], _temp_prefix: str) -> bool:
+def interesting(args: list[str], _temp_prefix: str) -> bool:
     """Interesting if the product of the numbers in the file divides the argument.
 
     Args:

src/lithium/interestingness/crashes.py

@@ -7,19 +7,19 @@
 Example:
     python -m lithium crashes --timeout=9 <binary> --fuzzing-safe <testcase>
 """
+from __future__ import annotations
 
 import logging
 import sys
-from typing import List, Optional
 
 from .timed_run import BaseParser, ExitStatus, timed_run
 
 LOG = logging.getLogger(__name__)
 
 
 def interesting(
-    cli_args: Optional[List[str]] = None,
-    temp_prefix: Optional[str] = None,
+    cli_args: list[str] | None = None,
+    temp_prefix: str | None = None,
 ) -> bool:
     """Interesting if the binary causes a crash.
 

src/lithium/interestingness/diff_test.py

@@ -12,18 +12,19 @@
       -b "--fuzzing-safe --wasm-always-baseline" \
       <binary> <testcase>
 """
+from __future__ import annotations
+
 import argparse
 import filecmp
 import logging
 import sys
-from typing import List, Optional, Union
 
 from .timed_run import BaseParser, ExitStatus, timed_run
 
 LOG = logging.getLogger(__name__)
 
 
-def parse_args(argv: Optional[List[str]] = None) -> argparse.Namespace:
+def parse_args(argv: list[str] | None = None) -> argparse.Namespace:
     """Parse args
 
     Args:
@@ -58,8 +59,8 @@ def parse_args(argv: Optional[List[str]] = None) -> argparse.Namespace:
 
 
 def interesting(
-    cli_args: Optional[List[str]] = None,
-    temp_prefix: Optional[str] = None,
+    cli_args: list[str] | None = None,
+    temp_prefix: str | None = None,
 ) -> bool:
     """Check if there's a difference in output or return code with different args.
 
@@ -98,8 +99,8 @@ def interesting(
 
     # Compare outputs
     def cmp_out(
-        a_data: Union[str, bytes],
-        b_run: Union[str, bytes],
+        a_data: str | bytes,
+        b_run: str | bytes,
         is_file: bool = False,
     ) -> bool:
         if is_file:

src/lithium/interestingness/hangs.py

@@ -7,19 +7,19 @@
 Example:
     python -m lithium hangs --timeout=3 <binary> --fuzzing-safe <testcase>
 """
+from __future__ import annotations
 
 import logging
 import sys
-from typing import List, Optional
 
 from .timed_run import BaseParser, ExitStatus, timed_run
 
 LOG = logging.getLogger(__name__)
 
 
 def interesting(
-    cli_args: Optional[List[str]] = None,
-    temp_prefix: Optional[str] = None,
+    cli_args: list[str] | None = None,
+    temp_prefix: str | None = None,
 ) -> bool:
     """Interesting if the binary causes a hang.
 

src/lithium/interestingness/outputs.py

@@ -8,20 +8,20 @@
 Example:
     python -m lithium outputs --timeout=9 FOO <binary> --fuzzing-safe <testcase>
 """
+from __future__ import annotations
 
 import logging
 import re
 import sys
 from pathlib import Path
-from typing import List, Optional, Union
 
 from . import utils
 from .timed_run import BaseParser, timed_run
 
 LOG = logging.getLogger(__name__)
 
 
-def file_contains(path: Union[Path, str], is_regex: bool, search: str) -> bool:
+def file_contains(path: Path | str, is_regex: bool, search: str) -> bool:
     """Determine if string is present in a file.
 
     Args:
@@ -38,8 +38,8 @@ def file_contains(path: Union[Path, str], is_regex: bool, search: str) -> bool:
 
 
 def interesting(
-    cli_args: Optional[List[str]] = None,
-    temp_prefix: Optional[str] = None,
+    cli_args: list[str] | None = None,
+    temp_prefix: str | None = None,
 ) -> bool:
     """Interesting if the binary causes an intended message to show up. (e.g. on
     stdout/stderr)

src/lithium/interestingness/repeat.py

@@ -31,12 +31,12 @@
 
 import argparse
 import logging
-from typing import Any, List, cast
+from typing import Any, cast
 
 from .utils import rel_or_abs_import
 
 
-def interesting(cli_args: List[str], temp_prefix: str) -> bool:
+def interesting(cli_args: list[str], temp_prefix: str) -> bool:
     """Interesting if the desired interestingness test that is run together with
     "repeat" also reports "interesting".
 

src/lithium/interestingness/timed_run.py

@@ -2,6 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 """Run a subprocess with timeout"""
+from __future__ import annotations
+
 import argparse
 import enum
 import logging
@@ -12,7 +14,7 @@
 import sys
 import time
 from pathlib import Path
-from typing import BinaryIO, Callable, Dict, List, Optional, Union
+from typing import BinaryIO, Callable
 
 from ffpuppet import SanitizerOptions
 
@@ -53,11 +55,11 @@ def __init__(
         self,
         pid: int,
         status: ExitStatus,
-        return_code: Union[int, None],
+        return_code: int | None,
         message: str,
         elapsed: float,
-        out: Union[bytes, str],
-        err: Union[bytes, str],
+        out: bytes | str,
+        err: bytes | str,
     ):
         self.pid = pid
         self.status = status
@@ -68,7 +70,7 @@ def __init__(
         self.err = err
 
 
-def _configure_sanitizers(orig_env: Dict[str, str]) -> Dict[str, str]:
+def _configure_sanitizers(orig_env: dict[str, str]) -> dict[str, str]:
     """Copy environment and update default values in *SAN_OPTIONS entries.
 
     Args:
@@ -77,7 +79,7 @@ def _configure_sanitizers(orig_env: Dict[str, str]) -> Dict[str, str]:
     Returns:
         Environment with *SAN_OPTIONS defaults set.
     """
-    env: Dict[str, str] = dict(orig_env)
+    env: dict[str, str] = dict(orig_env)
     # https://github.com/google/sanitizers/wiki/SanitizerCommonFlags
     common_flags = [
         ("abort_on_error", "false"),
@@ -126,12 +128,12 @@ def _get_signal_name(signum: int, default: str = "Unknown signal") -> str:
 
 
 def timed_run(
-    cmd_with_args: List[str],
+    cmd_with_args: list[str],
     timeout: int,
-    log_prefix: Optional[str] = None,
-    env: Optional[Dict[str, str]] = None,
+    log_prefix: str | None = None,
+    env: dict[str, str] | None = None,
     inp: str = "",
-    preexec_fn: Optional[Callable[[], None]] = None,
+    preexec_fn: Callable[[], None] | None = None,
 ) -> RunData:
     """If log_prefix is None, uses pipes instead of files for all output.
 
@@ -162,8 +164,8 @@ def timed_run(
 
     status = None
     env = _configure_sanitizers(os.environ.copy() if env is None else env)
-    child_stderr: Union[BinaryIO, int] = subprocess.PIPE
-    child_stdout: Union[BinaryIO, int] = subprocess.PIPE
+    child_stderr: BinaryIO | int = subprocess.PIPE
+    child_stdout: BinaryIO | int = subprocess.PIPE
     if log_prefix is not None:
         # pylint: disable=consider-using-with
         child_stdout = open(f"{log_prefix}-out.txt", "wb")

src/lithium/interestingness/utils.py

@@ -14,7 +14,7 @@
 import sys
 from pathlib import Path
 from types import ModuleType
-from typing import Tuple, Union
+from typing import Union
 
 
 def file_contains_str(
@@ -52,7 +52,7 @@ def file_contains_regex(
     input_file: Union[Path, str],
     regex: bytes,
     verbose: bool = True,
-) -> Tuple[bool, bytes]:
+) -> tuple[bool, bytes]:
     """e.g. python -m lithium crashesat --timeout=30 \
       --regex '^#0\\s*0x.* in\\s*.*(?:\\n|\\r\\n?)#1\\s*' \
       ./js --fuzzing-safe --no-threads --ion-eager testcase.js

src/lithium/reducer.py

@@ -2,14 +2,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 """lithium reducer"""
+from __future__ import annotations
 
 import argparse
 import logging
 import os
 import sys
+from collections.abc import Iterator
 from pathlib import Path
 from types import ModuleType
-from typing import Any, Dict, Iterator, List, Optional, Type, cast
+from typing import Any, cast
 
 from .interestingness.utils import rel_or_abs_import
 from .strategies import DEFAULT as DEFAULT_STRATEGY
@@ -43,22 +45,22 @@ class Lithium:
     """Lithium reduction object."""
 
     def __init__(self) -> None:
-        self.strategy: Optional[Strategy] = None
+        self.strategy: Strategy | None = None
 
-        self.condition_script: Optional[ModuleType] = None
-        self.condition_args: Optional[List[str]] = None
+        self.condition_script: ModuleType | None = None
+        self.condition_args: list[str] | None = None
 
         self.test_count = 0
         self.test_total = 0
 
-        self.temp_dir: Optional[Path] = None
+        self.temp_dir: Path | None = None
 
-        self.testcase: Optional[Testcase] = None
-        self.last_interesting: Optional[Testcase] = None
+        self.testcase: Testcase | None = None
+        self.last_interesting: Testcase | None = None
 
         self.temp_file_count = 1
 
-    def main(self, argv: Optional[List[str]] = None) -> int:
+    def main(self, argv: list[str] | None = None) -> int:
         """Main entrypoint (parse args and call `run()`)
 
         Args:
@@ -112,7 +114,7 @@ def run(self) -> int:
             if self.last_interesting is not None:
                 self.last_interesting.dump()
 
-    def process_args(self, argv: Optional[List[str]] = None) -> None:
+    def process_args(self, argv: list[str] | None = None) -> None:
         """Parse command-line args and initialize self.
 
         Args:
@@ -124,7 +126,7 @@ class _ArgParseTry(argparse.ArgumentParser):
             # pylint: disable=arguments-differ,no-self-argument
 
             def exit(  # type: ignore[override]
-                self, status: int = 0, message: Optional[str] = None
+                self, status: int = 0, message: str | None = None
             ) -> None:
                 pass
 
@@ -141,8 +143,8 @@ def error(self, message: str) -> None:  # type: ignore[override]
         grp_opt = parser.add_argument_group(description="Lithium options")
         grp_atoms = grp_opt.add_mutually_exclusive_group()
 
-        strategies: Dict[str, Type[Strategy]] = {}
-        testcase_types: Dict[str, Type[Testcase]] = {}
+        strategies: dict[str, type[Strategy]] = {}
+        testcase_types: dict[str, type[Testcase]] = {}
         for entry_point in iter_entry_points("lithium_strategies"):
             try:
                 strategy_cls = entry_point.load()