style: sorted all imports

jkowalleck · jkowalleck · commit 4780a84979d2 · 2022-02-27T11:36:08.000+01:00
Signed-off-by: Jan Kowalleck &lt;jan.kowalleck@gmail.com&gt;
diff --git a/cyclonedx/model/__init__.py b/cyclonedx/model/__init__.py
@@ -14,6 +14,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 import hashlib
 import re
 import sys
@@ -22,8 +23,13 @@
 from enum import Enum
 from typing import Iterable, Optional, Set
 
-from ..exception.model import InvalidLocaleTypeException, InvalidUriException, NoPropertiesProvidedException, \
-    MutuallyExclusivePropertiesException, UnknownHashTypeException
+from ..exception.model import (
+    InvalidLocaleTypeException,
+    InvalidUriException,
+    MutuallyExclusivePropertiesException,
+    NoPropertiesProvidedException,
+    UnknownHashTypeException,
+)
 
 """
 Uniform set of models to represent objects within a CycloneDX software bill-of-materials.
diff --git a/cyclonedx/model/bom.py b/cyclonedx/model/bom.py
@@ -16,14 +16,15 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 from datetime import datetime, timezone
 from typing import Iterable, Optional, Set
-from uuid import uuid4, UUID
+from uuid import UUID, uuid4
 
-from . import ExternalReference, OrganizationalContact, OrganizationalEntity, LicenseChoice, Property, ThisTool, Tool
+from ..parser import BaseParser
+from . import ExternalReference, LicenseChoice, OrganizationalContact, OrganizationalEntity, Property, ThisTool, Tool
 from .component import Component
 from .service import Service
-from ..parser import BaseParser
 
 
 class BomMetaData:
diff --git a/cyclonedx/model/bom_ref.py b/cyclonedx/model/bom_ref.py
@@ -16,6 +16,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 from typing import Optional
 from uuid import uuid4
 
diff --git a/cyclonedx/model/component.py b/cyclonedx/model/component.py
@@ -16,6 +16,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 import warnings
 from enum import Enum
 from os.path import exists
@@ -24,13 +25,24 @@
 # See https://github.com/package-url/packageurl-python/issues/65
 from packageurl import PackageURL  # type: ignore
 
-from . import AttachedText, Copyright, ExternalReference, HashAlgorithm, HashType, IdentifiableAction, LicenseChoice, \
-    OrganizationalEntity, Property, sha1sum, XsUri
+from ..exception.model import NoPropertiesProvidedException
+from . import (
+    AttachedText,
+    Copyright,
+    ExternalReference,
+    HashAlgorithm,
+    HashType,
+    IdentifiableAction,
+    LicenseChoice,
+    OrganizationalEntity,
+    Property,
+    XsUri,
+    sha1sum,
+)
 from .bom_ref import BomRef
 from .issue import IssueType
 from .release_note import ReleaseNotes
 from .vulnerability import Vulnerability
-from ..exception.model import NoPropertiesProvidedException
 
 
 class Commit:
diff --git a/cyclonedx/model/issue.py b/cyclonedx/model/issue.py
@@ -14,11 +14,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 from enum import Enum
 from typing import Iterable, Optional, Set
 
-from . import XsUri
 from ..exception.model import NoPropertiesProvidedException
+from . import XsUri
 
 
 class IssueClassification(Enum):
diff --git a/cyclonedx/model/release_note.py b/cyclonedx/model/release_note.py
@@ -16,6 +16,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 from datetime import datetime
 from typing import Iterable, Optional, Set
 
diff --git a/cyclonedx/model/service.py b/cyclonedx/model/service.py
@@ -14,9 +14,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 from typing import Iterable, Optional, Set
 
-from . import ExternalReference, DataClassification, LicenseChoice, OrganizationalEntity, Property, XsUri
+from . import DataClassification, ExternalReference, LicenseChoice, OrganizationalEntity, Property, XsUri
 from .bom_ref import BomRef
 from .release_note import ReleaseNotes
 
diff --git a/cyclonedx/model/vulnerability.py b/cyclonedx/model/vulnerability.py
@@ -16,18 +16,23 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 import re
 import warnings
 from datetime import datetime
 from decimal import Decimal
 from enum import Enum
 from typing import Iterable, Optional, Set, Tuple, Union
 
+from ..exception.model import MutuallyExclusivePropertiesException, NoPropertiesProvidedException
 from . import OrganizationalContact, OrganizationalEntity, Tool, XsUri
 from .bom_ref import BomRef
-from .impact_analysis import ImpactAnalysisAffectedStatus, ImpactAnalysisJustification, ImpactAnalysisResponse, \
-    ImpactAnalysisState
-from ..exception.model import MutuallyExclusivePropertiesException, NoPropertiesProvidedException
+from .impact_analysis import (
+    ImpactAnalysisAffectedStatus,
+    ImpactAnalysisJustification,
+    ImpactAnalysisResponse,
+    ImpactAnalysisState,
+)
 
 """
 This set of classes represents the data that is possible about known Vulnerabilities.
diff --git a/cyclonedx/output/json.py b/cyclonedx/output/json.py
@@ -16,17 +16,24 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 import json
 from abc import abstractmethod
-from typing import cast, Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union, cast
 
-from . import BaseOutput, SchemaVersion
-from .schema import BaseSchemaVersion, SchemaVersion1Dot0, SchemaVersion1Dot1, SchemaVersion1Dot2, SchemaVersion1Dot3, \
-    SchemaVersion1Dot4
-from .serializer.json import CycloneDxJSONEncoder
 from ..exception.output import FormatNotSupportedException
 from ..model.bom import Bom
 from ..model.component import Component
+from . import BaseOutput, SchemaVersion
+from .schema import (
+    BaseSchemaVersion,
+    SchemaVersion1Dot0,
+    SchemaVersion1Dot1,
+    SchemaVersion1Dot2,
+    SchemaVersion1Dot3,
+    SchemaVersion1Dot4,
+)
+from .serializer.json import CycloneDxJSONEncoder
 
 ComponentDict = Dict[str, Union[
     str,
diff --git a/cyclonedx/output/serializer/json.py b/cyclonedx/output/serializer/json.py
@@ -16,6 +16,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 from datetime import datetime
 from decimal import Decimal
 from enum import Enum
diff --git a/cyclonedx/output/xml.py b/cyclonedx/output/xml.py
@@ -21,17 +21,32 @@
 from typing import Optional, Set
 from xml.etree import ElementTree
 
-from . import BaseOutput, SchemaVersion
-from .schema import BaseSchemaVersion, SchemaVersion1Dot0, SchemaVersion1Dot1, SchemaVersion1Dot2, SchemaVersion1Dot3, \
-    SchemaVersion1Dot4
-from ..model import AttachedText, ExternalReference, HashType, IdentifiableAction, LicenseChoice, \
-    OrganizationalEntity, OrganizationalContact, Property, Tool
+from ..model import (
+    AttachedText,
+    ExternalReference,
+    HashType,
+    IdentifiableAction,
+    LicenseChoice,
+    OrganizationalContact,
+    OrganizationalEntity,
+    Property,
+    Tool,
+)
 from ..model.bom import Bom
 from ..model.bom_ref import BomRef
 from ..model.component import Component, Patch
 from ..model.release_note import ReleaseNotes
 from ..model.service import Service
-from ..model.vulnerability import Vulnerability, VulnerabilityRating, VulnerabilitySource, BomTargetVersionRange
+from ..model.vulnerability import BomTargetVersionRange, Vulnerability, VulnerabilityRating, VulnerabilitySource
+from . import BaseOutput, SchemaVersion
+from .schema import (
+    BaseSchemaVersion,
+    SchemaVersion1Dot0,
+    SchemaVersion1Dot1,
+    SchemaVersion1Dot2,
+    SchemaVersion1Dot3,
+    SchemaVersion1Dot4,
+)
 
 
 class Xml(BaseOutput, BaseSchemaVersion):
diff --git a/tests/base.py b/tests/base.py
@@ -16,6 +16,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 import io
 import json
 import os
@@ -34,7 +35,7 @@
 from cyclonedx.output import SchemaVersion
 
 if sys.version_info >= (3, 7):
-    from jsonschema import validate as json_validate, ValidationError
+    from jsonschema import ValidationError, validate as json_validate
 
 if sys.version_info >= (3, 8, 0):
     from importlib.metadata import version
diff --git a/tests/data.py b/tests/data.py
@@ -16,26 +16,65 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 import base64
 from datetime import datetime, timezone
 from decimal import Decimal
 from typing import List, Optional
 
 from packageurl import PackageURL
 
-from cyclonedx.model import AttachedText, DataClassification, DataFlow, Encoding, ExternalReference, \
-    ExternalReferenceType, HashType, LicenseChoice, License, Note, NoteText, OrganizationalContact, \
-    OrganizationalEntity, Property, Tool, XsUri
+from cyclonedx.model import (
+    AttachedText,
+    DataClassification,
+    DataFlow,
+    Encoding,
+    ExternalReference,
+    ExternalReferenceType,
+    HashType,
+    License,
+    LicenseChoice,
+    Note,
+    NoteText,
+    OrganizationalContact,
+    OrganizationalEntity,
+    Property,
+    Tool,
+    XsUri,
+)
 from cyclonedx.model.bom import Bom
-from cyclonedx.model.component import Commit, Component, ComponentEvidence, ComponentType, Copyright, Patch, \
-    PatchClassification, Pedigree, Swid, ComponentScope
+from cyclonedx.model.component import (
+    Commit,
+    Component,
+    ComponentEvidence,
+    ComponentScope,
+    ComponentType,
+    Copyright,
+    Patch,
+    PatchClassification,
+    Pedigree,
+    Swid,
+)
 from cyclonedx.model.issue import IssueClassification, IssueType, IssueTypeSource
 from cyclonedx.model.release_note import ReleaseNotes
 from cyclonedx.model.service import Service
-from cyclonedx.model.vulnerability import ImpactAnalysisState, ImpactAnalysisJustification, ImpactAnalysisResponse, \
-    ImpactAnalysisAffectedStatus, Vulnerability, VulnerabilityCredits, VulnerabilityRating, VulnerabilitySeverity, \
-    VulnerabilitySource, VulnerabilityScoreSource, VulnerabilityAdvisory, VulnerabilityReference, \
-    VulnerabilityAnalysis, BomTarget, BomTargetVersionRange
+from cyclonedx.model.vulnerability import (
+    BomTarget,
+    BomTargetVersionRange,
+    ImpactAnalysisAffectedStatus,
+    ImpactAnalysisJustification,
+    ImpactAnalysisResponse,
+    ImpactAnalysisState,
+    Vulnerability,
+    VulnerabilityAdvisory,
+    VulnerabilityAnalysis,
+    VulnerabilityCredits,
+    VulnerabilityRating,
+    VulnerabilityReference,
+    VulnerabilityScoreSource,
+    VulnerabilitySeverity,
+    VulnerabilitySource,
+)
 
 MOCK_TIMESTAMP: datetime = datetime(2021, 12, 31, 10, 0, 0, 0).replace(tzinfo=timezone.utc)
 MOCK_UUID_1 = 'be2c6502-7e9a-47db-9a66-e34f729810a3'
diff --git a/tests/test_bom.py b/tests/test_bom.py
@@ -16,11 +16,13 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 from unittest import TestCase
 
+from data import get_bom_with_component_setuptools_with_vulnerability
+
 from cyclonedx.model.bom import Bom, ThisTool, Tool
 from cyclonedx.model.component import Component, ComponentType
-from data import get_bom_with_component_setuptools_with_vulnerability
 
 
 class TestBom(TestCase):
diff --git a/tests/test_component.py b/tests/test_component.py
@@ -16,6 +16,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 from os.path import dirname, join
 from unittest import TestCase
 
diff --git a/tests/test_e2e_environment.py b/tests/test_e2e_environment.py
@@ -16,15 +16,17 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 import json
+from unittest import TestCase
+
 import pkg_resources
 from lxml import etree
 from packageurl import PackageURL
-from unittest import TestCase
 
 from cyclonedx.model.bom import Bom
 from cyclonedx.model.component import Component
-from cyclonedx.output import get_instance, OutputFormat
+from cyclonedx.output import OutputFormat, get_instance
 from cyclonedx.output.json import Json
 from cyclonedx.output.xml import Xml
 
diff --git a/tests/test_model.py b/tests/test_model.py
@@ -16,15 +16,30 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
 import base64
 import datetime
 from time import sleep
 from unittest import TestCase
 
-from cyclonedx.exception.model import InvalidLocaleTypeException, InvalidUriException, UnknownHashTypeException, \
-    NoPropertiesProvidedException
-from cyclonedx.model import Copyright, Encoding, ExternalReference, ExternalReferenceType, HashAlgorithm, HashType, \
-    IdentifiableAction, Note, NoteText, XsUri
+from cyclonedx.exception.model import (
+    InvalidLocaleTypeException,
+    InvalidUriException,
+    NoPropertiesProvidedException,
+    UnknownHashTypeException,
+)
+from cyclonedx.model import (
+    Copyright,
+    Encoding,
+    ExternalReference,
+    ExternalReferenceType,
+    HashAlgorithm,
+    HashType,
+    IdentifiableAction,
+    Note,
+    NoteText,
+    XsUri,
+)
 from cyclonedx.model.issue import IssueClassification, IssueType, IssueTypeSource
 
 
diff --git a/tests/test_model_component.py b/tests/test_model_component.py
diff --git a/tests/test_model_issue.py b/tests/test_model_issue.py
diff --git a/tests/test_model_release_note.py b/tests/test_model_release_note.py
diff --git a/tests/test_model_service.py b/tests/test_model_service.py
diff --git a/tests/test_model_vulnerability.py b/tests/test_model_vulnerability.py
diff --git a/tests/test_output_generic.py b/tests/test_output_generic.py
diff --git a/tests/test_output_json.py b/tests/test_output_json.py
diff --git a/tests/test_output_xml.py b/tests/test_output_xml.py

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`#`
`17`	`17`	`# SPDX-License-Identifier: Apache-2.0`
`18`	`18`	`# Copyright (c) OWASP Foundation. All Rights Reserved.`
	`19`	`+`
`19`	`20`	`from typing import Optional`
`20`	`21`	`from uuid import uuid4`
`21`	`22`