Remove flake8 warnings

Remove unused imports and trailing whitespace.
Sort usings in pyi file.

Signed-off-by: Rodney Richardson <[email protected]>

cyclonedx/model/__init__.py

@@ -21,7 +21,7 @@
 import warnings
 from datetime import datetime
 from enum import Enum
-from typing import Any, Iterable, Optional, Set, TypeVar
+from typing import Any, Iterable, Optional
 
 from sortedcontainers import SortedSet
 

cyclonedx/model/bom.py

@@ -18,7 +18,7 @@
 # Copyright (c) OWASP Foundation. All Rights Reserved.
 import warnings
 from datetime import datetime, timezone
-from typing import Iterable, Optional, Set
+from typing import Iterable, Optional
 from uuid import UUID, uuid4
 
 from sortedcontainers import SortedSet

cyclonedx/model/component.py

@@ -20,7 +20,7 @@
 import warnings
 from enum import Enum
 from os.path import exists
-from typing import Any, Iterable, Optional, Set
+from typing import Any, Iterable, Optional
 
 # See https://github.com/package-url/packageurl-python/issues/65
 from packageurl import PackageURL  # type: ignore

cyclonedx/model/dependency.py

@@ -17,7 +17,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
 
-from typing import Iterable, Optional, Set
+from typing import Iterable, Optional
 
 from sortedcontainers import SortedSet
 

cyclonedx/model/issue.py

@@ -16,7 +16,7 @@
 # Copyright (c) OWASP Foundation. All Rights Reserved.
 
 from enum import Enum
-from typing import Any, Iterable, Optional, Set
+from typing import Any, Iterable, Optional
 
 from sortedcontainers import SortedSet
 

cyclonedx/model/release_note.py

@@ -18,7 +18,7 @@
 # Copyright (c) OWASP Foundation. All Rights Reserved.
 
 from datetime import datetime
-from typing import Iterable, Optional, Set
+from typing import Iterable, Optional
 
 from sortedcontainers import SortedSet
 

cyclonedx/model/service.py

@@ -15,7 +15,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
 
-from typing import Any, Iterable, Optional, Set
+from typing import Any, Iterable, Optional
 
 from sortedcontainers import SortedSet
 

cyclonedx/model/vulnerability.py

@@ -22,7 +22,7 @@
 from datetime import datetime
 from decimal import Decimal
 from enum import Enum
-from typing import Any, Iterable, Optional, Set, Tuple, Union
+from typing import Any, Iterable, Optional, Tuple, Union
 
 from sortedcontainers import SortedSet
 
@@ -690,7 +690,7 @@ def __eq__(self, other: object) -> bool:
     def __lt__(self, other: Any) -> bool:
         if isinstance(other, VulnerabilityRating):
             return ComparableTuple(
-                    (self.severity, self.score, self.source, self.method, self.vector, self.justification)) < \
+                (self.severity, self.score, self.source, self.method, self.vector, self.justification)) < \
                 ComparableTuple(
                     (other.severity, other.score, other.source, other.method, other.vector, other.justification))
         return NotImplemented

cyclonedx/output/xml.py

@@ -18,7 +18,7 @@
 # Copyright (c) OWASP Foundation. All Rights Reserved.
 
 import warnings
-from typing import Iterable, Optional, Set
+from typing import Iterable, Optional
 from xml.etree import ElementTree
 
 from sortedcontainers import SortedSet

tests/data.py

@@ -345,8 +345,8 @@ def get_component_setuptools_simple(bom_ref: Optional[str] = None) -> Component:
         bom_ref=bom_ref or 'pkg:pypi/[email protected]?extension=tar.gz',
         purl=PackageURL(
             type='pypi', name='setuptools', version='50.3.2', qualifiers='extension=tar.gz'
-        ), 
-        licenses=[LicenseChoice(license_expression='MIT License')], 
+        ),
+        licenses=[LicenseChoice(license_expression='MIT License')],
         author='Test Author'
     )
 
@@ -356,8 +356,8 @@ def get_component_setuptools_simple_no_version(bom_ref: Optional[str] = None) ->
         name='setuptools', bom_ref=bom_ref or 'pkg:pypi/setuptools?extension=tar.gz',
         purl=PackageURL(
             type='pypi', name='setuptools', qualifiers='extension=tar.gz'
-        ), 
-        licenses=[LicenseChoice(license_expression='MIT License')], 
+        ),
+        licenses=[LicenseChoice(license_expression='MIT License')],
         author='Test Author'
     )
 

typings/sortedcontainers.pyi

@@ -4,8 +4,8 @@
 #  https://github.com/althonos/python-sortedcontainers/blob/d0a225d7fd0fb4c54532b8798af3cbeebf97e2d5/sortedcontainers/sortedset.pyi
 
 from typing import (
-    Any,
     AbstractSet,
+    Any,
     Callable,
     Generic,
     Hashable,
@@ -15,9 +15,9 @@ from typing import (
     MutableSet,
     Optional,
     Sequence,
+    Set,
     Tuple,
     Type,
-    Set,
     TypeVar,
     Union,
     overload,