style: fix lint issues resulting from dropping py38

Author: ahal

src/taskgraph/actions/registry.py

@@ -30,13 +30,13 @@ def is_json(data):
     return True
 
 
-@functools.lru_cache(maxsize=None)
+@functools.cache
 def read_taskcluster_yml(filename):
     """Load and parse .taskcluster.yml, cached to save some time"""
     return yaml.load_yaml(filename)
 
 
-@functools.lru_cache(maxsize=None)
+@functools.cache
 def hash_taskcluster_yml(filename):
     """
     Generate a hash of the given .taskcluster.yml.  This is the first 10 digits

src/taskgraph/config.py

@@ -8,7 +8,6 @@
 import sys
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Dict
 
 from voluptuous import ALLOW_EXTRA, All, Any, Extra, Length, Optional, Required
 
@@ -113,7 +112,7 @@
 
 @dataclass(frozen=True, eq=False)
 class GraphConfig:
-    _config: Dict
+    _config: dict
     root_dir: str
 
     _PATH_MODIFIED = False

src/taskgraph/docker.py

@@ -11,10 +11,11 @@
 import sys
 import tarfile
 import tempfile
+from collections.abc import Generator
 from io import BytesIO
 from pathlib import Path
 from textwrap import dedent
-from typing import Any, Dict, Generator, List, Optional, Union
+from typing import Any, Optional, Union
 
 from taskcluster.exceptions import TaskclusterRestFailure
 
@@ -246,7 +247,7 @@ def build_image(
 
 def load_image(
     url: str, imageName: Optional[str] = None, imageTag: Optional[str] = None
-) -> Dict[str, str]:
+) -> dict[str, str]:
     """Load docker image from URL as imageName:tag.
 
     Downloads a zstd-compressed docker image tarball from the given URL and
@@ -286,7 +287,7 @@ def load_image(
         else:
             imageTag = "latest"
 
-    info: Dict[str, str] = {}
+    info: dict[str, str] = {}
 
     def download_and_modify_image() -> Generator[bytes, None, None]:
         # This function downloads and edits the downloaded tar file on the fly.
@@ -377,14 +378,14 @@ def download_and_modify_image() -> Generator[bytes, None, None]:
     return info
 
 
-def _index(l: List, s: str) -> Optional[int]:
+def _index(l: list, s: str) -> Optional[int]:
     try:
         return l.index(s)
     except ValueError:
         pass
 
 
-def _resolve_image(image: Union[str, Dict[str, str]], graph_config: GraphConfig) -> str:
+def _resolve_image(image: Union[str, dict[str, str]], graph_config: GraphConfig) -> str:
     image_task_id = None
 
     # Standard case, image comes from the task definition.
@@ -419,12 +420,12 @@ def _resolve_image(image: Union[str, Dict[str, str]], graph_config: GraphConfig)
 
 def load_task(
     graph_config: GraphConfig,
-    task: Union[str, Dict[str, Any]],
+    task: Union[str, dict[str, Any]],
     remove: bool = True,
     user: Optional[str] = None,
     custom_image: Optional[str] = None,
     interactive: Optional[bool] = False,
-    volumes: Optional[Dict[str, str]] = None,
+    volumes: Optional[dict[str, str]] = None,
 ) -> int:
     """Load and run a task interactively in a Docker container.
 

src/taskgraph/generator.py

@@ -14,7 +14,7 @@
     wait,
 )
 from dataclasses import dataclass
-from typing import Callable, Dict, Optional, Union
+from typing import Callable, Optional, Union
 
 from . import filter_tasks
 from .config import GraphConfig, load_graph_config
@@ -42,7 +42,7 @@ class KindNotFound(Exception):
 class Kind:
     name: str
     path: str
-    config: Dict
+    config: dict
     graph_config: GraphConfig
 
     def _get_loader(self) -> Callable:

src/taskgraph/graph.py

@@ -5,7 +5,6 @@
 
 import collections
 from dataclasses import dataclass
-from typing import FrozenSet
 
 
 @dataclass(frozen=True)
@@ -24,8 +23,8 @@ class Graph:
     node `left` to node `right`..
     """
 
-    nodes: FrozenSet
-    edges: FrozenSet
+    nodes: frozenset
+    edges: frozenset
 
     def transitive_closure(self, nodes, reverse=False):
         """Return the transitive closure of <nodes>: the graph containing all

src/taskgraph/main.py

@@ -16,7 +16,7 @@
 from concurrent.futures import ProcessPoolExecutor, as_completed
 from pathlib import Path
 from textwrap import dedent
-from typing import Any, List
+from typing import Any
 from urllib.parse import urlparse
 
 import appdirs
@@ -412,7 +412,7 @@ def show_taskgraph(options):
     overrides = {
         "target-kinds": options.get("target_kinds"),
     }
-    parameters: List[Any[str, Parameters]] = options.pop("parameters")
+    parameters: list[Any[str, Parameters]] = options.pop("parameters")
     if not parameters:
         parameters = [
             parameters_loader(None, strict=False, overrides=overrides)

src/taskgraph/optimize/base.py

@@ -15,7 +15,6 @@
 import logging
 from abc import ABCMeta, abstractmethod
 from collections import defaultdict
-from typing import Dict, Set
 
 from slugid import nice as slugid
 
@@ -367,9 +366,9 @@ def replace_tasks(
 
 def get_subgraph(
     target_task_graph: TaskGraph,
-    removed_tasks: Set[str],
-    replaced_tasks: Set[str],
-    label_to_taskid: Dict[str, str],
+    removed_tasks: set[str],
+    replaced_tasks: set[str],
+    label_to_taskid: dict[str, str],
     decision_task_id: str,
 ):
     """

src/taskgraph/run-task/fetch-content

@@ -413,9 +413,12 @@ def extract_archive(path, dest_dir):
         raise ValueError(f"unknown archive format: {path}")
 
     if args:
-        with ifh, subprocess.Popen(
-            args, cwd=str(dest_dir), bufsize=0, stdin=subprocess.PIPE
-        ) as p:
+        with (
+            ifh,
+            subprocess.Popen(
+                args, cwd=str(dest_dir), bufsize=0, stdin=subprocess.PIPE
+            ) as p,
+        ):
             while True:
                 if not pipe_stdin:
                     break
@@ -527,10 +530,13 @@ def repack_archive(
     with rename_after_close(dest, "wb") as fh:
         ctx = ZstdCompressor()
         if orig_typ in ("exec", None):
-            with ctx.stream_writer(fh) as compressor, tarfile.open(
-                fileobj=compressor,
-                mode="w:",
-            ) as tar:
+            with (
+                ctx.stream_writer(fh) as compressor,
+                tarfile.open(
+                    fileobj=compressor,
+                    mode="w:",
+                ) as tar,
+            ):
                 tarinfo = tarfile.TarInfo()
                 tarinfo.name = filter(orig.name) if filter else orig.name
                 st = orig.stat()
@@ -543,9 +549,10 @@ def repack_archive(
             assert typ == "tar"
             zip = zipfile.ZipFile(ifh)
             # Convert the zip stream to a tar on the fly.
-            with ctx.stream_writer(fh) as compressor, tarfile.open(
-                fileobj=compressor, mode="w:"
-            ) as tar:
+            with (
+                ctx.stream_writer(fh) as compressor,
+                tarfile.open(fileobj=compressor, mode="w:") as tar,
+            ):
                 for zipinfo in zip.infolist():
                     if zipinfo.is_dir():
                         continue
@@ -587,11 +594,14 @@ def repack_archive(
                 # To apply the filter, we need to open the tar stream and
                 # tweak it.
                 origtar = tarfile.open(fileobj=ifh, mode="r|")
-                with ctx.stream_writer(fh) as compressor, tarfile.open(
-                    fileobj=compressor,
-                    mode="w:",
-                    format=origtar.format,
-                ) as tar:
+                with (
+                    ctx.stream_writer(fh) as compressor,
+                    tarfile.open(
+                        fileobj=compressor,
+                        mode="w:",
+                        format=origtar.format,
+                    ) as tar,
+                ):
                     for tarinfo in origtar:
                         if tarinfo.isdir():
                             continue

src/taskgraph/task.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from dataclasses import dataclass, field
-from typing import Any, Dict, List, Union
+from typing import Any, Union
 
 
 @dataclass
@@ -33,14 +33,14 @@ class Task:
 
     kind: str
     label: str
-    attributes: Dict
-    task: Dict
+    attributes: dict
+    task: dict
     description: str = ""
     task_id: Union[str, None] = field(default=None, init=False)
-    optimization: Union[Dict[str, Any], None] = field(default=None)
-    dependencies: Dict = field(default_factory=dict)
-    soft_dependencies: List = field(default_factory=list)
-    if_dependencies: List = field(default_factory=list)
+    optimization: Union[dict[str, Any], None] = field(default=None)
+    dependencies: dict = field(default_factory=dict)
+    soft_dependencies: list = field(default_factory=list)
+    if_dependencies: list = field(default_factory=list)
 
     def __post_init__(self):
         self.attributes["kind"] = self.kind

src/taskgraph/taskgraph.py

@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from dataclasses import dataclass
-from typing import Dict
 
 from .graph import Graph
 from .task import Task
@@ -21,7 +20,7 @@ class TaskGraph:
     tasks are "linked from" their dependents.
     """
 
-    tasks: Dict[str, Task]
+    tasks: dict[str, Task]
     graph: Graph
 
     def __post_init__(self):