Renamed model file to not reference CycloneDX as the models are agnostic on purpose.

Author: madpah

cyclonedx/model/bom.py

@@ -2,7 +2,7 @@
 from typing import List
 from uuid import uuid4
 
-from .cyclonedx import Component
+from .component import Component
 from ..parser import BaseParser
 
 

cyclonedx/model/cyclonedx.py renamed to cyclonedx/model/component.py

@@ -2,7 +2,7 @@
 
 from . import BaseOutput
 from .schema import BaseSchemaVersion, SchemaVersion1Dot0, SchemaVersion1Dot1, SchemaVersion1Dot2, SchemaVersion1Dot3
-from ..model.cyclonedx import Component
+from ..model.component import Component
 
 
 class Json(BaseOutput, BaseSchemaVersion):

cyclonedx/output/json.py

@@ -2,7 +2,7 @@
 
 from . import BaseOutput
 from .schema import BaseSchemaVersion, SchemaVersion1Dot0, SchemaVersion1Dot1, SchemaVersion1Dot2, SchemaVersion1Dot3
-from ..model.cyclonedx import Component
+from ..model.component import Component
 
 
 class Xml(BaseOutput, BaseSchemaVersion):

cyclonedx/output/xml.py

@@ -1,7 +1,7 @@
 from abc import ABC
 from typing import List
 
-from ..model.cyclonedx import Component
+from ..model.component import Component
 
 
 class BaseParser(ABC):

cyclonedx/parser/__init__.py

@@ -7,7 +7,7 @@
 
 from . import BaseParser
 
-from ..model.cyclonedx import Component
+from ..model.component import Component
 
 
 class EnvironmentParser(BaseParser):

cyclonedx/parser/environment.py

@@ -2,7 +2,7 @@
 
 from . import BaseParser
 
-from ..model.cyclonedx import Component
+from ..model.component import Component
 
 
 class RequirementsParser(BaseParser):

cyclonedx/parser/requirements.py

@@ -3,7 +3,7 @@
 import os
 
 from cyclonedx.model.bom import Bom
-from cyclonedx.model.cyclonedx import Component
+from cyclonedx.model.component import Component
 from cyclonedx.parser.requirements import RequirementsFileParser
 
 

tests/test_bom.py

@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from cyclonedx.model.cyclonedx import Component
+from cyclonedx.model.component import Component
 from packageurl import PackageURL
 
 

tests/test_component.py

@@ -2,7 +2,7 @@
 from tests.base import BaseJsonTestCase
 
 from cyclonedx.model.bom import Bom
-from cyclonedx.model.cyclonedx import Component
+from cyclonedx.model.component import Component
 from cyclonedx.output import get_instance, OutputFormat, SchemaVersion
 from cyclonedx.output.json import JsonV1Dot3, JsonV1Dot2