lint(ruff): Enable newer annotation style

.github/scripts/summary.py

@@ -1,8 +1,10 @@
 # ruff: noqa:D100,D101,D102,D103,D105
+from __future__ import annotations
+
 import argparse
 import logging
 from dataclasses import InitVar, dataclass, field
-from typing import Any, List, Literal, Optional
+from typing import Any, Literal
 from xml.etree import ElementTree
 
 from tabulate import tabulate
@@ -16,10 +18,10 @@ class TestCase:
     name: str
     time: float
     state: Literal["success", "failure", "error", "skipped"]
-    summary: Optional[str]
+    summary: str | None
 
     @classmethod
-    def from_junit(cls, tree: ElementTree.Element) -> "TestCase":
+    def from_junit(cls, tree: ElementTree.Element) -> TestCase:
         children = tree.getchildren()
         assert len(children) <= 1
 
@@ -67,13 +69,13 @@ class TestSuite:
     failures: int
     skipped: int
     time: float
-    tests: List[TestCase]
+    tests: list[TestCase]
 
     def __post_init__(self, total: int) -> None:
         self.successes = total - self.errors - self.failures - self.skipped
 
     @classmethod
-    def from_junit(cls, tree: ElementTree.Element) -> "TestSuite":
+    def from_junit(cls, tree: ElementTree.Element) -> TestSuite:
         attrs = tree.attrib
 
         tests = [
@@ -97,7 +99,7 @@ def __lt__(self, other: Any) -> bool:
         return (self.time, self.name) < (other.time, other.name)
 
 
-def get_failures_and_errors(testsuites: List[TestSuite]) -> str:
+def get_failures_and_errors(testsuites: list[TestSuite]) -> str:
     reports = []
 
     for testsuite in testsuites:

docs/_extensions/cleanup_signatures.py

@@ -1,7 +1,10 @@
-from typing import Any, Dict, Optional, Tuple
+from __future__ import annotations
 
-from sphinx.application import Sphinx
-from sphinx.ext.autodoc import Options
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from sphinx.application import Sphinx
+    from sphinx.ext.autodoc import Options
 
 
 # ruff: noqa: ARG001
@@ -11,17 +14,17 @@ def cleanup_signatures(  # pylint: disable=unused-argument
     name: str,
     obj: Any,
     options: Options,
-    signature: Optional[str],
-    return_annotation: Optional[str],
-) -> Optional[Tuple[str, Optional[str]]]:
+    signature: str | None,
+    return_annotation: str | None,
+) -> tuple[str, str | None] | None:
     if name == "dwas.StepRunner":
         # Hide the __init__ signature for dwas.StepRunner, it's meant to be
         # private
         return ("()", return_annotation)
     return None
 
 
-def setup(app: Sphinx) -> Dict[str, Any]:
+def setup(app: Sphinx) -> dict[str, Any]:
     app.connect("autodoc-process-signature", cleanup_signatures)
 
     return {

docs/_extensions/execute.py

@@ -1,15 +1,19 @@
+from __future__ import annotations
+
 import os
 import shlex
 import subprocess
-from typing import Any, Dict, List
+from typing import TYPE_CHECKING, Any
 
 from docutils import nodes
 from docutils.parsers import rst
 from docutils.parsers.rst.directives import nonnegative_int, unchanged
-from sphinx.addnodes import document
-from sphinx.application import Sphinx
 from sphinx.errors import ExtensionError
 
+if TYPE_CHECKING:
+    from sphinx.addnodes import document
+    from sphinx.application import Sphinx
+
 
 class execute(nodes.Element):  # pylint: disable=invalid-name  # noqa: N801
     pass
@@ -25,7 +29,7 @@ class ExecuteDirective(rst.Directive):
         "cwd": unchanged,
     }
 
-    def run(self) -> List[nodes.Element]:
+    def run(self) -> list[nodes.Element]:
         env = self.state.document.settings.env
 
         node = execute()
@@ -77,7 +81,7 @@ def run_programs(
         node.replace_self(new_node)
 
 
-def setup(app: Sphinx) -> Dict[str, Any]:
+def setup(app: Sphinx) -> dict[str, Any]:
     app.add_directive("command-output", ExecuteDirective)
     app.connect("doctree-read", run_programs)
     return {"parallel_read_safe": True}

pyproject.toml

@@ -178,11 +178,6 @@ ignore = [
     "S603",
     # We want to be able tor rely on PATH and not hardcode binaries
     "S607",
-
-    # FIXME: re-enable future annotations
-    "FA100",
-    # FIXME: re-enable upgrade rules
-    "UP",
 ]
 
 flake8-pytest-style.parametrize-values-type = "tuple"

src/dwas/__main__.py

@@ -1,4 +1,6 @@
 # ruff: noqa:D100,D101,D102,D103
+from __future__ import annotations
+
 import importlib.util
 import logging
 import os
@@ -14,13 +16,15 @@
 )
 from contextvars import copy_context
 from importlib.metadata import version
-from typing import Any, Dict, List, Optional
+from typing import TYPE_CHECKING, Any
 
 from . import _io, _pipeline
 from ._config import Config
 from ._exceptions import BaseDwasException, FailedPipelineException
 from ._logging import setup_logging
-from ._steps.handlers import BaseStepHandler
+
+if TYPE_CHECKING:
+    from ._steps.handlers import BaseStepHandler
 
 LOGGER = logging.getLogger(__name__)
 
@@ -31,7 +35,7 @@ def __call__(
         parser: ArgumentParser,  # noqa:ARG002
         namespace: Namespace,
         values: Any,
-        option_string: Optional[str] = None,  # noqa:ARG002
+        option_string: str | None = None,  # noqa:ARG002
     ) -> None:
         items = getattr(namespace, self.dest, None)
         if items is None:
@@ -52,7 +56,7 @@ def __call__(
         parser: ArgumentParser,  # noqa:ARG002
         namespace: Namespace,
         values: Any,  # noqa:ARG002
-        option_string: Optional[str] = None,
+        option_string: str | None = None,
     ) -> None:
         assert option_string is not None
 
@@ -65,7 +69,7 @@ def format_usage(self) -> str:
         return " | ".join(self.option_strings)
 
 
-def _parse_args(args: Optional[List[str]] = None) -> Namespace:
+def _parse_args(args: list[str] | None = None) -> Namespace:
     parser = ArgumentParser(
         formatter_class=RawDescriptionHelpFormatter,
         epilog="""\
@@ -195,8 +199,8 @@ def _parse_args(args: Optional[List[str]] = None) -> Namespace:
 
 
 def _parse_steps(
-    args: List[str], known_steps: Dict[str, BaseStepHandler]
-) -> Optional[List[str]]:
+    args: list[str], known_steps: dict[str, BaseStepHandler]
+) -> list[str] | None:
     if not args:
         return None
 
@@ -275,8 +279,8 @@ def _load_user_config(
 def _execute_pipeline(
     config: Config,
     pipeline_config: str,
-    steps_parameters: List[str],
-    except_steps: Optional[List[str]],
+    steps_parameters: list[str],
+    except_steps: list[str] | None,
     *,
     only_selected_step: bool,
     clean: bool,
@@ -314,7 +318,7 @@ def _execute_pipeline(
 
 
 @_io.instrument_streams()
-def main(sys_args: Optional[List[str]] = None) -> None:
+def main(sys_args: list[str] | None = None) -> None:
     if sys_args is None:
         sys_args = sys.argv[1:]
     if env_args := os.environ.get("DWAS_ADDOPTS"):

src/dwas/_config.py

@@ -1,11 +1,12 @@
+from __future__ import annotations
+
 import logging
 import multiprocessing
 import os
 import random
 import shutil
 import sys
 from pathlib import Path
-from typing import Dict, Optional
 
 from ._exceptions import BaseDwasException
 
@@ -56,7 +57,7 @@ class Config:
     - Finally, it will look if this is attached to a tty and enable colors if so.
     """
 
-    environ: Dict[str, str]
+    environ: dict[str, str]
     """
     The environment to use when running commands.
 
@@ -123,9 +124,9 @@ class Config:
     def __init__(
         self,
         cache_path: str,
-        log_path: Optional[str],
+        log_path: str | None,
         verbosity: int,
-        colors: Optional[bool],
+        colors: bool | None,
         n_jobs: int,
         *,
         skip_missing_interpreters: bool,
@@ -201,7 +202,7 @@ def __init__(
             self.environ["PY_COLORS"] = "0"
             self.environ["NO_COLOR"] = "0"
 
-    def _get_color_setting(self, colors: Optional[bool]) -> bool:
+    def _get_color_setting(self, colors: bool | None) -> bool:
         # pylint: disable=too-many-return-statements
         if colors is not None:
             return colors

src/dwas/_dependency_injection.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 import inspect
 import logging
-from typing import Any, Callable, Dict, TypeVar
+from typing import Any, Callable, TypeVar
 
 from ._exceptions import BaseDwasException
 from ._inspect import get_location, get_name
@@ -10,7 +12,7 @@
 
 
 def call_with_parameters(
-    func: Callable[..., T], parameters: Dict[str, Any]
+    func: Callable[..., T], parameters: dict[str, Any]
 ) -> T:
     signature = inspect.signature(func)
     kwargs = {}

src/dwas/_exceptions.py

@@ -1,4 +1,4 @@
-from typing import List
+from __future__ import annotations
 
 
 class BaseDwasException(Exception):
@@ -46,13 +46,13 @@ def _pluralize(self, n_jobs: int) -> str:
 
 
 class UnknownStepsException(BaseDwasException):
-    def __init__(self, steps: List[str]) -> None:
+    def __init__(self, steps: list[str]) -> None:
         message = f"Unknown steps: {', '.join(steps)}"
         super().__init__(message)
 
 
 class CyclicStepDependenciesException(BaseDwasException):
-    def __init__(self, cycle: List[str]) -> None:
+    def __init__(self, cycle: list[str]) -> None:
         message = f"Cyclic dependencies between steps: {' --> '.join(cycle)}"
         super().__init__(message)
         self.cycle = cycle

src/dwas/_frontend.py

@@ -1,18 +1,22 @@
+from __future__ import annotations
+
 import shutil
 import sys
 import time
 from contextlib import contextmanager
 from contextvars import copy_context
 from datetime import timedelta
 from threading import Event, Thread
-from typing import Iterator, List
+from typing import TYPE_CHECKING, Iterator
 
 from colorama import Cursor, Fore, Style, ansi
 
 from . import _io
-from ._scheduler import Scheduler
 from ._timing import format_timedelta
 
+if TYPE_CHECKING:
+    from ._scheduler import Scheduler
+
 ANSI_SHOW_CURSOR = f"{ansi.CSI}?25h"
 ANSI_HIDE_CURSOR = f"{ansi.CSI}?25l"
 
@@ -25,7 +29,7 @@
     def _counter(self, value: int, color: str) -> str:
         return f"{color}{Style.BRIGHT}{value}{Style.NORMAL}{Fore.YELLOW}"
 
-    def lines(self) -> List[str]:
+    def lines(self) -> list[str]:
         update_at = time.monotonic()
 
         term_width = shutil.get_terminal_size().columns
@@ -55,7 +59,7 @@
             "~",
         )
 
-        additional_info: List[str] = []
+        additional_info: list[str] = []
         if self._scheduler.ready:
             ready_line = (
                 f"[-:--:--] {Fore.YELLOW}{Style.BRIGHT}ready: "