resolve conversation

Author: Jannis-Mittenzwei

exasol/toolbox/nox/_lint.py

@@ -2,12 +2,11 @@
 
 import argparse
 import sys
+from collections.abc import Iterable
 from pathlib import Path
 from typing import (
     Dict,
-    Iterable,
     List,
-    Dict
 )
 
 import nox
@@ -18,11 +17,6 @@
 from exasol.toolbox.nox._shared import python_files
 from noxconfig import PROJECT_CONFIG
 
-from pathlib import Path
-import rich.console
-import tomlkit
-import sys
-
 
 def _pylint(session: Session, files: Iterable[str]) -> None:
     session.run(
@@ -85,26 +79,23 @@ def _import_lint(session: Session, path: Path) -> None:
 
 
 class Dependencies:
-    def __init__(self, illegal: Dict[str, List[str]] | None):
+    def __init__(self, illegal: dict[str, list[str]] | None):
         self._illegal = illegal or {}
 
     @staticmethod
-    def parse(pyproject_toml: str) -> "Dependencies":
+    def parse(pyproject_toml: str) -> Dependencies:
         def _source_filter(version) -> bool:
-            ILLEGAL_SPECIFIERS = ['url', 'git', 'path']
-            return any(
-                specifier in version
-                for specifier in ILLEGAL_SPECIFIERS
-            )
+            ILLEGAL_SPECIFIERS = ["url", "git", "path"]
+            return any(specifier in version for specifier in ILLEGAL_SPECIFIERS)
 
-        def find_illegal(part) -> List[str]:
+        def find_illegal(part) -> list[str]:
             return [
                 f"{name} = {version}"
                 for name, version in part.items()
                 if _source_filter(version)
             ]
 
-        illegal: Dict[str, List[str]] = {}
+        illegal: dict[str, list[str]] = {}
         toml = tomlkit.loads(pyproject_toml)
         poetry = toml.get("tool", {}).get("poetry", {})
 
@@ -124,11 +115,11 @@ def find_illegal(part) -> List[str]:
         return Dependencies(illegal)
 
     @property
-    def illegal(self) -> Dict[str, List[str]]:
+    def illegal(self) -> dict[str, list[str]]:
         return self._illegal
 
 
-def report_illegal(illegal: Dict[str, List[str]], console: rich.console.Console):
+def report_illegal(illegal: dict[str, list[str]], console: rich.console.Console):
     count = sum(len(deps) for deps in illegal.values())
     suffix = "y" if count == 1 else "ies"
     console.print(f"{count} illegal dependenc{suffix}\n", style="red")
@@ -168,4 +159,4 @@ def dependency_check(session: Session) -> None:
     console = rich.console.Console()
     if illegal := dependencies.illegal:
         report_illegal(illegal, console)
-        sys.exit(1)
+        sys.exit(1)

exasol/toolbox/tools/security.py

@@ -4,6 +4,10 @@
 import re
 import subprocess
 import sys
+from collections.abc import (
+    Generator,
+    Iterable,
+)
 from dataclasses import (
     asdict,
     dataclass,
@@ -12,11 +16,7 @@
 from functools import partial
 from inspect import cleandoc
 from pathlib import Path
-from typing import (
-    Generator,
-    Iterable,
-    Tuple,
-)
+from typing import Tuple
 
 import typer
 
@@ -48,7 +48,7 @@ def _issues_as_json_str(issues):
         yield json.dumps(issue)
 
 
-def gh_security_issues() -> Generator[Tuple[str, str], None, None]:
+def gh_security_issues() -> Generator[tuple[str, str], None, None]:
     """
     Yields issue-id, cve-id pairs for all (closed, open) issues associated with CVEs
 
@@ -129,14 +129,16 @@ def from_json(report_str: str, prefix: Path) -> Iterable[SecurityIssue]:
             cwe=str(issue["issue_cwe"].get("id", "")),
             test_id=issue["test_id"],
             description=issue["issue_text"],
-            references=tuple(references)
+            references=tuple(references),
         )
 
 
 def issues_to_markdown(issues: Iterable[SecurityIssue]) -> str:
-    template = cleandoc("""
+    template = cleandoc(
+        """
         {header}{rows}
-    """)
+    """
+    )
 
     def _header():
         header = "# Security\n\n"
@@ -154,10 +156,7 @@ def _row(issue):
         row = row[:-5] + "|"
         return row
 
-    return template.format(
-        header=_header(),
-        rows="\n".join(_row(i) for i in issues)
-    )
+    return template.format(header=_header(), rows="\n".join(_row(i) for i in issues))
 
 
 def security_issue_title(issue: Issue) -> str:
@@ -188,7 +187,7 @@ def as_markdown_listing(elements: Iterable[str]):
     )
 
 
-def create_security_issue(issue: Issue, project="") -> Tuple[str, str]:
+def create_security_issue(issue: Issue, project="") -> tuple[str, str]:
     # fmt: off
     command = [
         "gh", "issue", "create",
@@ -218,6 +217,7 @@ def create_security_issue(issue: Issue, project="") -> Tuple[str, str]:
 CVE_CLI = typer.Typer()
 CLI.add_typer(CVE_CLI, name="cve", help="Work with CVE's")
 
+
 class Format(str, Enum):
     Maven = "maven"
 
@@ -321,8 +321,10 @@ class PPrintFormats(str, Enum):
 
 @CLI.command(name="pretty-print")
 def json_issue_to_markdown(
-        json_file: typer.FileText = typer.Argument(mode="r", help="json file with issues to convert"),
-        path: Path = typer.Argument(default=Path("."), help="path to project root")
+    json_file: typer.FileText = typer.Argument(
+        mode="r", help="json file with issues to convert"
+    ),
+    path: Path = typer.Argument(default=Path("."), help="path to project root"),
 ) -> None:
     content = json_file.read()
     issues = from_json(content, path.absolute())