Fix a bunch of ruff errors

Author: adamtheturtle

pip_check_reqs/common.py

@@ -1,6 +1,8 @@
 
 """Common functions."""
 
+from __future__ import annotations
+
 import ast
 import fnmatch
 import imp
@@ -12,14 +14,8 @@
 from pathlib import Path
 from typing import (
     Callable,
-    Dict,
     Generator,
     Iterable,
-    List,
-    Optional,
-    Set,
-    Tuple,
-    Union,
 )
 
 from packaging.markers import Marker
@@ -39,7 +35,7 @@ class FoundModule:
 
     modname: str
     filename: str
-    locations: List[Tuple[str, int]] = field(default_factory=list)
+    locations: list[tuple[str, int]] = field(default_factory=list)
 
     def __post_init__(self) -> None:
         self.filename = os.path.realpath(self.filename)
@@ -49,8 +45,8 @@ class _ImportVisitor(ast.NodeVisitor):
     def __init__(self, ignore_modules_function: Callable[[str], bool]) -> None:
         super().__init__()
         self._ignore_modules_function = ignore_modules_function
-        self._modules: Dict[str, FoundModule] = {}
-        self._location: Optional[str] = None
+        self._modules: dict[str, FoundModule] = {}
+        self._location: str | None = None
 
     def set_location(self, location: str) -> None:
         self._location = location
@@ -120,7 +116,7 @@ def _add_module(self, modname: str, lineno: int) -> None:
         assert isinstance(self._location, str)
         self._modules[modname].locations.append((self._location, lineno))
 
-    def finalise(self) -> Dict[str, FoundModule]:
+    def finalise(self) -> dict[str, FoundModule]:
         return self._modules
 
 
@@ -140,7 +136,7 @@ def find_imported_modules(
     paths: Iterable[Path],
     ignore_files_function: Callable[[str], bool],
     ignore_modules_function: Callable[[str], bool],
-) -> Dict[str, FoundModule]:
+) -> dict[str, FoundModule]:
     vis = _ImportVisitor(ignore_modules_function=ignore_modules_function)
     for path in paths:
         for filename in pyfiles(path):
@@ -157,11 +153,11 @@ def find_imported_modules(
 
 def find_required_modules(
     ignore_requirements_function: Callable[
-        [Union[str, ParsedRequirement]], bool,
+        [str | ParsedRequirement], bool,
     ],
     skip_incompatible: bool,
     requirements_filename: Path,
-) -> Set[NormalizedName]:
+) -> set[NormalizedName]:
     explicit = set()
     for requirement in parse_requirements(
         str(requirements_filename), session=PipSession(),
@@ -212,13 +208,13 @@ def is_package_file(path: str) -> str:
     return ""
 
 
-def ignorer(ignore_cfg: List[str]) -> Callable[..., bool]:
+def ignorer(ignore_cfg: list[str]) -> Callable[..., bool]:
     if not ignore_cfg:
         return lambda candidate: False
 
     def ignorer_function(
-        candidate: Union[str, ParsedRequirement],
-        ignore_cfg: List[str] = ignore_cfg,
+        candidate: str | ParsedRequirement,
+        ignore_cfg: list[str] = ignore_cfg,
     ) -> bool:
         for ignore in ignore_cfg:
             if isinstance(candidate, str):

pip_check_reqs/find_extra_reqs.py

@@ -25,6 +25,7 @@
 
 
 def find_extra_reqs(
+    *,
     requirements_filename: Path,
     paths: Iterable[Path],
     ignore_files_function: Callable[[str], bool],

pip_check_reqs/find_missing_reqs.py

@@ -1,13 +1,15 @@
 """Find missing requirements."""
 
+from __future__ import annotations
+
 import argparse
 import collections
 import importlib.metadata
 import logging
 import os
 import sys
 from pathlib import Path
-from typing import Callable, Iterable, List, Optional, Tuple
+from typing import Callable, Iterable
 from unittest import mock
 
 from packaging.utils import NormalizedName, canonicalize_name
@@ -27,7 +29,7 @@ def find_missing_reqs(
     paths: Iterable[Path],
     ignore_files_function: Callable[[str], bool],
     ignore_modules_function: Callable[[str], bool],
-) -> List[Tuple[NormalizedName, List[FoundModule]]]:
+) -> list[tuple[NormalizedName, list[FoundModule]]]:
     # 1. find files used by imports in the code (as best we can without
     #    executing)
     used_modules = common.find_imported_modules(
@@ -70,7 +72,7 @@ def find_missing_reqs(
         )
         for package_file in package_files:
             path = os.path.realpath(
-                os.path.join(package_location, package_file),
+                str(Path(package_location) / package_file),
             )
             installed_files[path] = package_name
             package_path = common.is_package_file(path)
@@ -116,7 +118,7 @@ def find_missing_reqs(
     return [(name, used[name]) for name in used if name not in explicit]
 
 
-def main(arguments: Optional[List[str]] = None) -> None:
+def main(arguments: list[str] | None = None) -> None:
     usage = "usage: %prog [options] files or directories"
     parser = argparse.ArgumentParser(usage)
     parser.add_argument("paths", type=Path, nargs="*")
@@ -173,7 +175,7 @@ def main(arguments: Optional[List[str]] = None) -> None:
     parse_result = parser.parse_args(arguments)
 
     if parse_result.version:
-        print(version_info())
+        sys.stdout.write(version_info() + "\n")
         sys.exit(0)
 
     if not parse_result.paths:

tests/test_find_missing_reqs.py

@@ -1,5 +1,6 @@
 """Tests for `find_missing_reqs.py`."""
 
+from __future__ import annotations
 
 import logging
 import os
@@ -123,6 +124,7 @@ def test_main_no_spec(capsys: pytest.CaptureFixture[str]) -> None:
     ],
 )
 def test_logging_config(
+    *,
     caplog: pytest.LogCaptureFixture,
     verbose_cfg: bool,
     debug_cfg: bool,