Update to Python-3.10+-style type hinting

Author: ctrueden

src/appose/builder.py

@@ -31,21 +31,24 @@
 TODO
 """
 
-import os
+from __future__ import annotations
+
 from pathlib import Path
-from typing import Dict, List, Optional, Sequence, Union
 
 from .environment import Environment
-from .paths import find_exe
-from .service import Service
+
 
 class Builder:
+    """
+    TODO
+    """
+
     def __init__(self):
-        self.base_dir: Optional[Path] = None
+        self.base_dir: Path | None = None
         self.system_path: bool = False
-        self.conda_environment_yaml: Optional[Path] = None
-        self.java_vendor: Optional[str] = None
-        self.java_version: Optional[str] = None
+        self.conda_environment_yaml: Path | None = None
+        self.java_vendor: str | None = None
+        self.java_version: str | None = None
 
     def build(self):
         # TODO: Build the thing!

src/appose/environment.py

@@ -31,16 +31,17 @@
 TODO
 """
 
+from __future__ import annotations
+
 import os
 from pathlib import Path
-from typing import Dict, List, Optional, Sequence, Union
 
 from .paths import find_exe
 from .service import Service
 
 
 class Environment:
-    def __init__(self, base: Union[Path, str], use_system_path: bool = False):
+    def __init__(self, base: Path | str, use_system_path: bool = False):
         self.base = Path(base).absolute()
         self.use_system_path = use_system_path
 
@@ -71,8 +72,8 @@ def python(self) -> Service:
 
     def groovy(
         self,
-        class_path: Optional[Sequence[str]] = None,
-        jvm_args: Optional[Sequence[str]] = None,
+        class_path: list[str] | None = None,
+        jvm_args: list[str] | None = None,
     ) -> Service:
         """
         Create a Groovy script service. Groovy (https://groovy-lang.org/)
@@ -101,11 +102,11 @@ def groovy(
     def java(
         self,
         main_class: str,
-        class_path: Optional[Sequence[str]] = None,
-        jvm_args: Optional[Sequence[str]] = None,
+        class_path: list[str] | None = None,
+        jvm_args: list[str] | None = None,
     ) -> Service:
         # Collect classpath elements into a set, to avoid duplicate entries.
-        cp: Dict[str] = {}  # NB: Use dict instead of set to maintain insertion order.
+        cp: dict[str] = {}  # NB: Use dict instead of set to maintain insertion order.
 
         # TODO: Ensure that the classpath includes Appose and its dependencies.
 
@@ -134,7 +135,7 @@ def java(
         ]
         return self.service(java_exes, *args)
 
-    def service(self, exes: Sequence[str], *args) -> Service:
+    def service(self, exes: list[str], *args) -> Service:
         """
         Create a service with the given command line arguments.
 
@@ -156,7 +157,7 @@ def service(self, exes: Sequence[str], *args) -> Service:
         if not exes:
             raise ValueError("No executable given")
 
-        dirs: List[str] = (
+        dirs: list[str] = (
             os.environ["PATH"].split(os.pathsep)
             if self.use_system_path
             else [self.base]
@@ -166,6 +167,6 @@ def service(self, exes: Sequence[str], *args) -> Service:
         if exe_file is None:
             raise ValueError(f"No executables found amongst candidates: {exes}")
 
-        all_args: List[str] = [str(exe_file)]
+        all_args: list[str] = [str(exe_file)]
         all_args.extend(args)
         return Service(self.base, all_args)

src/appose/paths.py

@@ -31,16 +31,17 @@
 Utility functions for working with file paths.
 """
 
+from __future__ import annotations
+
 import os
 from pathlib import Path
-from typing import Optional, Sequence
 
 
 def can_execute(exe: Path) -> bool:
     return os.access(exe, os.X_OK)
 
 
-def find_exe(dirs: Sequence[str], exes: Sequence[str]) -> Optional[Path]:
+def find_exe(dirs: list[str], exes: list[str]) -> Path | None:
     for exe in exes:
         exe_file = Path(exe)
         if exe_file.is_absolute():

src/appose/types.py

@@ -27,13 +27,19 @@
 # #L%
 ###
 
+"""
+TODO
+"""
+
+from __future__ import annotations
+
 import json
 import re
 from math import ceil, prod
 from multiprocessing import resource_tracker, shared_memory
-from typing import Any, Dict, Sequence, Union
+from typing import Any
 
-Args = Dict[str, Any]
+Args = dict[str, Any]
 
 
 class SharedMemory(shared_memory.SharedMemory):
@@ -150,7 +156,7 @@ class NDArray:
     a particular shape, and flattened into SharedMemory.
     """
 
-    def __init__(self, dtype: str, shape: Sequence[int], shm: SharedMemory = None):
+    def __init__(self, dtype: str, shape: list[int], shm: SharedMemory = None):
         """
         Create an NDArray.
         :param dtype: The type of the data elements; e.g. int8, uint8, float32, float64.
@@ -216,7 +222,7 @@ def default(self, obj):
         return super().default(obj)
 
 
-def _appose_object_hook(obj: Dict):
+def _appose_object_hook(obj: dict):
     atype = obj.get("appose_type")
     if atype == "shm":
         # Attach to existing shared memory block.
@@ -227,7 +233,7 @@ def _appose_object_hook(obj: Dict):
         return obj
 
 
-def _bytes_per_element(dtype: str) -> Union[int, float]:
+def _bytes_per_element(dtype: str) -> int | float:
     try:
         bits = int(re.sub("[^0-9]", "", dtype))
     except ValueError: