Remove outdated annotation

syntax.
Bump bugfix release in pyproject.
Remove pandas requirement, which
is not used, from pyproject.toml

Author: pyth0n1c

contentctl/enrichments/attack_enrichment.py

@@ -3,7 +3,7 @@
 import logging
 from dataclasses import field
 from pathlib import Path
-from typing import Any, Dict, List, TypedDict, cast
+from typing import Any, TypedDict, cast
 
 from attackcti import attack_client  # type: ignore[reportMissingTypeStubs]
 from pydantic import BaseModel
@@ -24,7 +24,7 @@ class AttackPattern(TypedDict):
     id: str
     technique_id: str
     technique: str
-    tactic: List[str]
+    tactic: list[str]
 
 
 class IntrusionSet(TypedDict):
@@ -38,7 +38,7 @@ class Relationship(TypedDict):
 
 
 class AttackEnrichment(BaseModel):
-    data: Dict[str, MitreAttackEnrichment] = field(default_factory=dict)
+    data: dict[str, MitreAttackEnrichment] = field(default_factory=dict)
     use_enrichment: bool = True
 
     @staticmethod
@@ -64,7 +64,7 @@ def getEnrichmentByMitreID(
             )
 
     def addMitreIDViaGroupNames(
-        self, technique: Dict[str, Any], tactics: List[str], groupNames: List[str]
+        self, technique: dict[str, Any], tactics: list[str], groupNames: list[str]
     ) -> None:
         technique_id = technique["technique_id"]
         technique_obj = technique["technique"]
@@ -84,15 +84,15 @@ def addMitreIDViaGroupNames(
 
     def addMitreIDViaGroupObjects(
         self,
-        technique: Dict[str, Any],
-        tactics: List[MitreTactics],
-        groupDicts: List[Dict[str, Any]],
+        technique: dict[str, Any],
+        tactics: list[MitreTactics],
+        groupDicts: list[dict[str, Any]],
     ) -> None:
         technique_id = technique["technique_id"]
         technique_obj = technique["technique"]
         tactics.sort()
 
-        groupNames: List[str] = sorted([group["group"] for group in groupDicts])
+        groupNames: list[str] = sorted([group["group"] for group in groupDicts])
 
         if technique_id in self.data:
             raise Exception(f"Error, trying to redefine MITRE ID '{technique_id}'")
@@ -109,8 +109,8 @@ def addMitreIDViaGroupObjects(
 
     def get_attack_lookup(
         self, input_path: Path, enrichments: bool = False
-    ) -> Dict[str, MitreAttackEnrichment]:
-        attack_lookup: Dict[str, MitreAttackEnrichment] = {}
+    ) -> dict[str, MitreAttackEnrichment]:
+        attack_lookup: dict[str, MitreAttackEnrichment] = {}
         if not enrichments:
             return attack_lookup
 
@@ -141,17 +141,17 @@ def get_attack_lookup(
             )
 
             all_enterprise_techniques = cast(
-                List[AttackPattern], lift.get_enterprise_techniques(stix_format=False)
+                list[AttackPattern], lift.get_enterprise_techniques(stix_format=False)
             )
             enterprise_relationships = cast(
-                List[Relationship], lift.get_enterprise_relationships(stix_format=False)
+                list[Relationship], lift.get_enterprise_relationships(stix_format=False)
             )
             enterprise_groups = cast(
-                List[IntrusionSet], lift.get_enterprise_groups(stix_format=False)
+                list[IntrusionSet], lift.get_enterprise_groups(stix_format=False)
             )
 
             for technique in all_enterprise_techniques:
-                apt_groups: List[Dict[str, Any]] = []
+                apt_groups: list[dict[str, Any]] = []
                 for relationship in enterprise_relationships:
                     if relationship["target_object"] == technique[
                         "id"
@@ -160,7 +160,7 @@ def get_attack_lookup(
                             if relationship["source_object"] == group["id"]:
                                 apt_groups.append(dict(group))
 
-                tactics: List[MitreTactics] = []
+                tactics: list[MitreTactics] = []
                 if "tactic" in technique:
                     for tactic in technique["tactic"]:
                         tactics.append(

contentctl/output/attack_nav_output.py

@@ -2,7 +2,7 @@
 import json
 import pathlib
 from datetime import datetime
-from typing import Any, TypedDict, Union
+from typing import Any, TypedDict
 
 # Third-party imports
 from contentctl.objects.detection import Detection
@@ -21,10 +21,10 @@ class LayerData(TypedDict):
     description: str
     filters: dict[str, list[str]]
     sorting: int
-    layout: dict[str, Union[str, bool]]
+    layout: dict[str, str | bool]
     hideDisabled: bool
     techniques: list[dict[str, Any]]
-    gradient: dict[str, Union[list[str], int]]
+    gradient: dict[str, list[str] | int]
     legendItems: list[dict[str, str]]
     showTacticRowBackground: bool
     tacticRowBackground: str

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "contentctl"
 
-version = "5.5.3"
+version = "5.5.4"
 
 description = "Splunk Content Control Tool"
 authors = ["STRT <[email protected]>"]
@@ -30,7 +30,6 @@ tqdm = "^4.66.5"
 pygit2 = "^1.15.1"
 tyro = "^0.9.2"
 gitpython = "^3.1.43"
-pandas = "^2.3.0"
 setuptools = ">=69.5.1,<81.0.0"
 rich = "^14.0.0"