Merge remote-tracking branch 'origin/main' into OxPirates_main

Author: jkowalleck

cyclonedx/model/bom.py

@@ -703,7 +703,7 @@ def validate(self) -> bool:
         # 2. if root component is set and there are other components: dependencies should exist for the Component
         # this BOM is describing
         if self.metadata.component and len(self.components) > 0 and not any(map(
-            lambda d: d.ref == self.metadata.component.bom_ref and len(d.dependencies) > 0,  # type: ignore[union-attr]
+            lambda d: d.ref == self.metadata.component.bom_ref and len(d.dependencies) > 0,  # type:ignore[union-attr]
             self.dependencies
         )):
             warn(

cyclonedx/model/definition.py

@@ -368,7 +368,7 @@ def requirements(self) -> 'SortedSet[BomRef]':
 
     @requirements.setter
     def requirements(self, requirements: Iterable[Union[str, BomRef]]) -> None:
-        self._requirements = SortedSet(map(_bom_ref_from_str,  # type: ignore[arg-type]
+        self._requirements = SortedSet(map(_bom_ref_from_str,  # type:ignore[arg-type]
                                            requirements))
 
     def __comparable_tuple(self) -> _ComparableTuple: