Skip to content

Commit

Permalink
chore: absolute tet imports
Browse files Browse the repository at this point in the history
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
  • Loading branch information
jkowalleck committed Sep 21, 2023
1 parent 06b5eb0 commit 39e0eb9
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 21 deletions.
5 changes: 2 additions & 3 deletions tests/test_component.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@

from cyclonedx.model import sha1sum
from cyclonedx.model.component import Component

from . import TESTDATA_DIRECTORY
from .data import get_component_setuptools_simple
from tests import TESTDATA_DIRECTORY
from tests.data import get_component_setuptools_simple

RELEVANT_TESTDATA_DIRECTORY = join(TESTDATA_DIRECTORY, 'own', 'xml', '1.4')

Expand Down
3 changes: 1 addition & 2 deletions tests/test_deserialize_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

from cyclonedx.model.bom import Bom
from cyclonedx.output import LATEST_SUPPORTED_SCHEMA_VERSION, OutputFormat, SchemaVersion, get_instance
from tests import TESTDATA_DIRECTORY
from tests.base import BaseJsonTestCase
from tests.data import (
MOCK_BOM_UUID_1,
Expand Down Expand Up @@ -54,8 +55,6 @@
get_bom_with_services_simple,
)

from . import TESTDATA_DIRECTORY

RELEVANT_TESTDATA_DIRECTORY = join(TESTDATA_DIRECTORY, 'own', 'json')


Expand Down
3 changes: 1 addition & 2 deletions tests/test_deserialize_xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
from cyclonedx.model.bom import Bom
from cyclonedx.output import LATEST_SUPPORTED_SCHEMA_VERSION, SchemaVersion, get_instance
from cyclonedx.schema import OutputFormat
from tests import TESTDATA_DIRECTORY
from tests.base import BaseXmlTestCase
from tests.data import (
MOCK_BOM_UUID_1,
Expand All @@ -53,8 +54,6 @@
get_bom_with_services_simple,
)

from . import TESTDATA_DIRECTORY

RELEVANT_TESTDATA_DIRECTORY = join(TESTDATA_DIRECTORY, 'own', 'xml')


Expand Down
3 changes: 1 addition & 2 deletions tests/test_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@
XsUri,
)
from cyclonedx.model.issue import IssueClassification, IssueType, IssueTypeSource

from .data import reorder
from tests.data import reorder


class DummyStringEnum(str, Enum):
Expand Down
3 changes: 1 addition & 2 deletions tests/test_model_bom.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
from cyclonedx.model.bom import Bom, BomMetaData
from cyclonedx.model.bom_ref import BomRef
from cyclonedx.model.component import Component, ComponentType

from .data import (
from tests.data import (
get_bom_for_issue_275_components,
get_bom_with_component_setuptools_with_vulnerability,
get_component_setuptools_simple,
Expand Down
3 changes: 1 addition & 2 deletions tests/test_model_bom_ref.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
from unittest import TestCase

from cyclonedx.model.bom_ref import BomRef

from .data import reorder
from tests.data import reorder


class TestBomRef(TestCase):
Expand Down
3 changes: 1 addition & 2 deletions tests/test_model_issue.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
from cyclonedx.exception.model import NoPropertiesProvidedException
from cyclonedx.model import XsUri
from cyclonedx.model.issue import IssueClassification, IssueType, IssueTypeSource

from .data import get_issue_1, get_issue_2, reorder
from tests.data import get_issue_1, get_issue_2, reorder


class TestModelIssueType(TestCase):
Expand Down
3 changes: 1 addition & 2 deletions tests/test_real_world_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@

from cyclonedx.model.bom import Bom
from cyclonedx.schema import SchemaVersion

from . import TESTDATA_DIRECTORY
from tests import TESTDATA_DIRECTORY

RELEVANT_TESTDATA_DIRECTORY = join(TESTDATA_DIRECTORY, 'own', 'xml')

Expand Down
3 changes: 1 addition & 2 deletions tests/test_validation_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
from cyclonedx.exception import MissingOptionalDependencyException
from cyclonedx.schema import SchemaVersion
from cyclonedx.validation.json import JsonStrictValidator, JsonValidator

from . import TESTDATA_DIRECTORY
from tests import TESTDATA_DIRECTORY

RELEVANT_TESTDATA_DIRECTORY = join(TESTDATA_DIRECTORY, 'schemaTestData')

Expand Down
3 changes: 1 addition & 2 deletions tests/test_validation_xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
from cyclonedx.exception import MissingOptionalDependencyException
from cyclonedx.schema import SchemaVersion
from cyclonedx.validation.xml import XmlValidator

from . import TESTDATA_DIRECTORY
from tests import TESTDATA_DIRECTORY

RELEVANT_TESTDATA_DIRECTORY = join(TESTDATA_DIRECTORY, 'schemaTestData')

Expand Down

0 comments on commit 39e0eb9

Please sign in to comment.