Renamed model file to not reference CycloneDX as the models are agnos…

…tic on purpose.
CycloneDX · Sep 3, 2021 · 03d03ed · 03d03ed
1 parent 5d3d491
commit 03d03ed
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 10 deletions.
diff --git a/cyclonedx/model/bom.py b/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
 
 

diff --git a/cyclonedx/model/cyclonedx.py → cyclonedx/model/component.py b/cyclonedx/model/cyclonedx.py → cyclonedx/model/component.py
diff --git a/cyclonedx/output/json.py b/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 Json(BaseOutput, BaseSchemaVersion):

diff --git a/cyclonedx/output/xml.py b/cyclonedx/output/xml.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):

diff --git a/cyclonedx/parser/__init__.py b/cyclonedx/parser/__init__.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):

diff --git a/cyclonedx/parser/environment.py b/cyclonedx/parser/environment.py
@@ -7,7 +7,7 @@
 
 from . import BaseParser
 
-from ..model.cyclonedx import Component
+from ..model.component import Component
 
 
 class EnvironmentParser(BaseParser):

diff --git a/cyclonedx/parser/requirements.py b/cyclonedx/parser/requirements.py
@@ -2,7 +2,7 @@
 
 from . import BaseParser
 
-from ..model.cyclonedx import Component
+from ..model.component import Component
 
 
 class RequirementsParser(BaseParser):

diff --git a/tests/test_bom.py b/tests/test_bom.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
 
 

diff --git a/tests/test_component.py b/tests/test_component.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
 
 

diff --git a/tests/test_output_json.py b/tests/test_output_json.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
 

diff --git a/tests/test_output_xml.py b/tests/test_output_xml.py
@@ -1,7 +1,7 @@
 from os.path import dirname, join
 
 from cyclonedx.model.bom import Bom
-from cyclonedx.model.cyclonedx import Component
+from cyclonedx.model.component import Component
 from cyclonedx.output import get_instance, SchemaVersion
 from cyclonedx.output.xml import XmlV1Dot3, XmlV1Dot2, XmlV1Dot1, XmlV1Dot0, Xml