Revert non-tooling Pyright compatibility changes

Author: Copilot

.isort.cfg

@@ -2,7 +2,6 @@
 ## read the docs: https://pycqa.github.io/isort/docs/configuration/options.html
 ## keep in sync with flake8 config - in `.flake8` file
 known_first_party = cyclonedx
-known_third_party = py_serializable
 skip_gitignore = false
 skip_glob =
     build/*,dist/*,__pycache__,.eggs,*.egg-info*,

cyclonedx/model/definition.py

@@ -375,10 +375,8 @@ def requirements(self) -> 'SortedSet[BomRef]':
 
     @requirements.setter
     def requirements(self, requirements: Iterable[Union[str, BomRef]]) -> None:
-        self._requirements = SortedSet(
-            _bom_ref_from_str(requirement)
-            for requirement in requirements
-        )
+        self._requirements = SortedSet(map(_bom_ref_from_str,  # type:ignore[arg-type]
+                                           requirements))
 
     def __comparable_tuple(self) -> _ComparableTuple:
         # all properties are optional - so need to compare all, in hope that one is unique

cyclonedx/schema/__init__.py

@@ -73,22 +73,19 @@ def to_version(self) -> str:
         """Return as a version string - e.g. `1.4`"""
         return '.'.join(map(str, self.value))
 
-    def __comparable_value(self) -> tuple[int, int]:
-        return self.value
-
     def __ne__(self, other: Any) -> bool:
         if isinstance(other, self.__class__):
             return self.value != other.value
         return NotImplemented  # pragma: no cover
 
     def __lt__(self, other: Any) -> bool:
         if isinstance(other, self.__class__):
-            return self.__comparable_value() < other.__comparable_value()
+            return self.value < other.value
         return NotImplemented  # pragma: no cover
 
     def __le__(self, other: Any) -> bool:
         if isinstance(other, self.__class__):
-            return self.__comparable_value() <= other.__comparable_value()
+            return self.value <= other.value
         return NotImplemented  # pragma: no cover
 
     def __eq__(self, other: Any) -> bool:
@@ -98,12 +95,12 @@ def __eq__(self, other: Any) -> bool:
 
     def __ge__(self, other: Any) -> bool:
         if isinstance(other, self.__class__):
-            return self.__comparable_value() >= other.__comparable_value()
+            return self.value >= other.value
         return NotImplemented  # pragma: no cover
 
     def __gt__(self, other: Any) -> bool:
         if isinstance(other, self.__class__):
-            return self.__comparable_value() > other.__comparable_value()
+            return self.value > other.value
         return NotImplemented  # pragma: no cover
 
     def __hash__(self) -> int:

examples/complex_validation.py

@@ -22,7 +22,6 @@
 from cyclonedx.exception import MissingOptionalDependencyException
 from cyclonedx.schema import OutputFormat, SchemaVersion
 from cyclonedx.validation import make_schemabased_validator
-from cyclonedx.validation.json import JsonValidationError
 
 if TYPE_CHECKING:
     from cyclonedx.validation.json import JsonValidator
@@ -86,29 +85,27 @@
 
 # 1. Validate valid SBOM
 try:
-    validation_error = json_validator.validate_str(JSON_SBOM)
+    validation_errors = json_validator.validate_str(JSON_SBOM)
 except MissingOptionalDependencyException as error:
     print('JSON validation was skipped:', error)
 else:
-    if validation_error:
+    if validation_errors:
         print('JSON SBOM is unexpectedly invalid!', file=sys.stderr)
     else:
         print('JSON SBOM is valid')
 
     # 2. Validate invalid SBOM and inspect details
     print('\nChecking invalid JSON SBOM...')
     try:
-        validation_error = json_validator.validate_str(INVALID_JSON_SBOM)
+        validation_errors = json_validator.validate_str(INVALID_JSON_SBOM)
     except MissingOptionalDependencyException as error:
         print('JSON validation was skipped:', error)
     else:
-        if validation_error:
-            if not isinstance(validation_error, JsonValidationError):
-                raise TypeError('Expected a single JSON validation error')
+        if validation_errors:
             print('Validation failed as expected.')
-            print(f'Error Message: {validation_error.data.message}')
-            print(f'JSON Path:     {validation_error.data.json_path}')
-            print(f'Invalid Data:  {validation_error.data.instance}')
+            print(f'Error Message: {validation_errors.data.message}')
+            print(f'JSON Path:     {validation_errors.data.json_path}')
+            print(f'Invalid Data:  {validation_errors.data.instance}')
 
 # endregion JSON Validation