Ruff: Add and fix PYI024 (+ merge PYI) (#13002)

Author: kiblik

dojo/tools/blackduck/model.py

@@ -1,29 +1,23 @@
-from collections import namedtuple
+from typing import NamedTuple
 
-# this class can be updated to use @dataclass in Python 3.7
-# note that all types are strings except for 'locations' which is a set of
-# strings
-BlackduckFinding = namedtuple(
-    "BlackduckFinding",
-    [
-        "vuln_id",
-        "description",
-        "security_risk",
-        "impact",
-        "component_name",
-        "component_version",
-        "vuln_source",
-        "url",
-        "channel_version_origin_id",
-        "component_origin_id",
-        "published_date",
-        "updated_date",
-        "base_score",
-        "exploitability",
-        "remediation_status",
-        "remediation_target_date",
-        "remediation_actual_date",
-        "remediation_comment",
-        "locations",
-    ],
-)
+
+class BlackduckFinding(NamedTuple):
+    vuln_id: str
+    description: str
+    security_risk: str
+    impact: str
+    component_name: str
+    component_version: str
+    vuln_source: str
+    url: str
+    channel_version_origin_id: str
+    component_origin_id: str
+    published_date: str
+    updated_date: str
+    base_score: str
+    exploitability: str
+    remediation_status: str
+    remediation_target_date: str
+    remediation_actual_date: str
+    remediation_comment: str
+    locations: str

dojo/tools/blackduck_binary_analysis/model.py

@@ -1,34 +1,31 @@
-from collections import namedtuple
+from typing import NamedTuple
 
-BlackduckBinaryAnalysisFinding = namedtuple(
-    "BlackduckBinaryAnalysisFinding",
-    [
-        "report_name",
-        "component",
-        "version",
-        "latest_version",
-        "cve",
-        "matching_type",
-        "cvss_v2",
-        "cve_publication_date",
-        "object_compilation_date",
-        "object_name",
-        "object_full_path",
-        "object_sha1",
-        "cvss_v3",
-        "cvss_vector_v2",
-        "cvss_vector_v3",
-        "summary",
-        "distribution_package",
-        "cvss_distribution_v2",
-        "cvss_distribution_v3",
-        "triage_vectors",
-        "unresolving_triage_vectors",
-        "note_type",
-        "note_reason",
-        "vulnerability_url",
-        "missing_exploit_mitigations",
-        "bdsa",
-        "version_override_type",
-    ],
-)
+
+class BlackduckBinaryAnalysisFinding(NamedTuple):
+    report_name: str
+    component: str
+    version: str
+    latest_version: str
+    cve: str
+    matching_type: str
+    cvss_v2: str
+    cve_publication_date: str
+    object_compilation_date: str
+    object_name: str
+    object_full_path: str
+    object_sha1: str
+    cvss_v3: str
+    cvss_vector_v2: str
+    cvss_vector_v3: str
+    summary: str
+    distribution_package: str
+    cvss_distribution_v2: str
+    cvss_distribution_v3: str
+    triage_vectors: str
+    unresolving_triage_vectors: str
+    note_type: str
+    note_reason: str
+    vulnerability_url: str
+    missing_exploit_mitigations: str
+    bdsa: str
+    version_override_type: str

ruff.toml

@@ -57,7 +57,7 @@ select = [
    "INP",
    "PIE",
    "T20",
-   "PYI00", "PYI01", "PYI020", "PYI021", "PYI025", "PYI026", "PYI029",  "PYI03",  "PYI04",  "PYI05",  "PYI06",
+   "PYI",
    "PT001", "PT002", "PT003", "PT006", "PT007", "PT008", "PT01", "PT020", "PT021", "PT022", "PT023", "PT024", "PT025", "PT026", "PT028", "PT029", "PT03",
    "Q",
    "RSE",