Fix a bunch of ruff errors

Author: adamtheturtle

pip_check_reqs/common.py

@@ -1,3 +1,4 @@
+
 """Common functions."""
 
 import ast

pip_check_reqs/find_extra_reqs.py

@@ -1,22 +1,26 @@
 """Find extra 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, Union
+from typing import TYPE_CHECKING, Callable, Iterable
 from unittest import mock
 
 from packaging.utils import canonicalize_name
 from pip._internal.commands.show import search_packages_info
-from pip._internal.req.req_file import ParsedRequirement
 
 from pip_check_reqs import common
 from pip_check_reqs.common import version_info
 
+if TYPE_CHECKING:
+    from pip._internal.req.req_file import ParsedRequirement
+
 log = logging.getLogger(__name__)
 
 
@@ -26,10 +30,10 @@ def find_extra_reqs(
     ignore_files_function: Callable[[str], bool],
     ignore_modules_function: Callable[[str], bool],
     ignore_requirements_function: Callable[
-        [Union[str, ParsedRequirement]], bool,
+        [str | ParsedRequirement], bool,
     ],
     skip_incompatible: bool,
-) -> List[str]:
+) -> list[str]:
     # 1. find files used by imports in the code (as best we can without
     #    executing)
     used_modules = common.find_imported_modules(
@@ -112,7 +116,7 @@ def find_extra_reqs(
     return [name for name in explicit if name not in used]
 
 
-def main(arguments: Optional[List[str]] = None) -> None:
+def main(arguments: list[str] | None = None) -> None:
     """Main entry point."""
     usage = "usage: %prog [options] files or directories"
     parser = argparse.ArgumentParser(usage)

pyproject.toml

@@ -95,6 +95,9 @@ line-length = 79
 strict = true
 
 [tool.ruff]
+
+target-version = "py38"
+
 select = ["ALL"]
 
 ignore = [

setup.py

@@ -1,28 +1,28 @@
-from codecs import open
-from os import path
+from __future__ import annotations
+
 from pathlib import Path
-from typing import List
 
 from setuptools import setup
 
 from pip_check_reqs import __version__
 
-here = path.abspath(path.dirname(__file__))
+here = Path.resolve(Path(__file__).parent)
 
 
-def _get_dependencies(requirements_file: Path) -> List[str]:
+def _get_dependencies(requirements_file: Path) -> list[str]:
     """Return requirements from a requirements file.
+
     This expects a requirements file with no ``--find-links`` lines.
     """
     lines = requirements_file.read_text().strip().split("\n")
     return [line for line in lines if not line.startswith("#")]
 
 
-with open(path.join(here, "README.rst"), encoding="utf-8") as f:
-    long_description = f.read()
-
-with open(path.join(here, "CHANGELOG.rst"), encoding="utf-8") as f:
-    long_description += f.read()
+readme = here / "README.rst"
+readme_content = readme.read_text(encoding="utf-8")
+changelog = here / "CHANGELOG.rst"
+changelog_content = changelog.read_text(encoding="utf-8")
+long_description = readme_content + "\n\n" + changelog_content
 
 INSTALL_REQUIRES = _get_dependencies(
     requirements_file=Path("requirements.txt"),

tests/__init__.py

@@ -1,5 +1,6 @@
 """Tests for `common.py`."""
 
+from __future__ import annotations
 
 import ast
 import builtins
@@ -8,7 +9,7 @@
 import textwrap
 from copy import copy
 from pathlib import Path
-from typing import Any, List, Tuple
+from typing import Any
 
 import pytest
 from pytest import MonkeyPatch
@@ -53,7 +54,7 @@ def test_found_module() -> None:
         ("from . import baz", []),
     ],
 )
-def test_import_visitor(stmt: str, result: List[str]) -> None:
+def test_import_visitor(stmt: str, result: list[str]) -> None:
     vis = common._ImportVisitor(  # pylint: disable=protected-access
         ignore_modules_function=common.ignorer(ignore_cfg=[]),
     )
@@ -118,8 +119,8 @@ def test_find_imported_modules(
     caplog: pytest.LogCaptureFixture,
     ignore_ham: bool,
     ignore_hashlib: bool,
-    expect: List[str],
-    locs: List[Tuple[str, int]],
+    expect: list[str],
+    locs: list[tuple[str, int]],
     tmp_path: Path,
 ) -> None:
     root = tmp_path
@@ -188,7 +189,7 @@ def ignore_mods(module: str) -> bool:
 )
 def test_ignorer(
     monkeypatch: MonkeyPatch,
-    ignore_cfg: List[str],
+    ignore_cfg: list[str],
     candidate: str,
     result: bool,
 ) -> None:

tests/test_common.py

@@ -1,16 +1,19 @@
 """Tests for `find_extra_reqs.py`."""
 
+from __future__ import annotations
 
 import logging
 import textwrap
-from pathlib import Path
-from typing import Set
+from typing import TYPE_CHECKING
 
 import black
 import pytest
 
 from pip_check_reqs import common, find_extra_reqs
 
+if TYPE_CHECKING:
+    from pathlib import Path
+
 
 def test_find_extra_reqs(tmp_path: Path) -> None:
     installed_not_imported_required_package = pytest
@@ -87,26 +90,28 @@ def test_main_no_spec(capsys: pytest.CaptureFixture[str]) -> None:
     with pytest.raises(SystemExit) as excinfo:
         find_extra_reqs.main(arguments=[])
 
-    assert excinfo.value.code == 2
+    expected_code = 2
+    assert excinfo.value.code == expected_code
     err = capsys.readouterr().err
     assert err.endswith("error: no source files or directories specified\n")
 
 
 @pytest.mark.parametrize(
-    ("verbose_cfg", "debug_cfg", "expected_log_levels"),
+    ("expected_log_levels", "verbose_cfg", "debug_cfg"),
     [
-        (False, False, {logging.WARNING}),
-        (True, False, {logging.INFO, logging.WARNING}),
-        (False, True, {logging.DEBUG, logging.INFO, logging.WARNING}),
-        (True, True, {logging.DEBUG, logging.INFO, logging.WARNING}),
+        ({logging.WARNING}, False, False),
+        ({logging.INFO, logging.WARNING}, True, False),
+        ({logging.DEBUG, logging.INFO, logging.WARNING}, False, True),
+        ({logging.DEBUG, logging.INFO, logging.WARNING}, True, True),
     ],
 )
 def test_logging_config(
     caplog: pytest.LogCaptureFixture,
+    expected_log_levels: set[int],
+    tmp_path: Path,
+    *,
     verbose_cfg: bool,
     debug_cfg: bool,
-    expected_log_levels: Set[int],
-    tmp_path: Path,
 ) -> None:
     source_dir = tmp_path / "source"
     source_dir.mkdir()

tests/test_find_extra_reqs.py

@@ -107,7 +107,8 @@ def test_main_no_spec(capsys: pytest.CaptureFixture[str]) -> None:
     with pytest.raises(SystemExit) as excinfo:
         find_missing_reqs.main(arguments=[])
 
-    assert excinfo.value.code == 2
+    expected_code = 2
+    assert excinfo.value.code == expected_code
     err = capsys.readouterr().err
     assert err.endswith("error: no source files or directories specified\n")