diff --git a/cyclonedx/__init__.py b/cyclonedx/__init__.py index 449a92d8..d51cb1fa 100644 --- a/cyclonedx/__init__.py +++ b/cyclonedx/__init__.py @@ -11,6 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 +# Copyright (c) OWASP Foundation. All Rights Reserved. + """ Python library for generating and representing CycloneDX software bill-of-materials. diff --git a/cyclonedx/exception/__init__.py b/cyclonedx/exception/__init__.py index 72752a73..868373fd 100644 --- a/cyclonedx/exception/__init__.py +++ b/cyclonedx/exception/__init__.py @@ -11,7 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 -# +# Copyright (c) OWASP Foundation. All Rights Reserved. + """ Exceptions that are specific to the CycloneDX library implementation. diff --git a/cyclonedx/exception/factory.py b/cyclonedx/exception/factory.py index 5211f9e8..322e1fc3 100644 --- a/cyclonedx/exception/factory.py +++ b/cyclonedx/exception/factory.py @@ -11,7 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 -# +# Copyright (c) OWASP Foundation. All Rights Reserved. + """ Exceptions relating to specific conditions that occur when factoring a model. diff --git a/cyclonedx/exception/model.py b/cyclonedx/exception/model.py index 5481983c..05633e24 100644 --- a/cyclonedx/exception/model.py +++ b/cyclonedx/exception/model.py @@ -11,7 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 -# +# Copyright (c) OWASP Foundation. All Rights Reserved. + """ Exceptions relating to specific conditions that occur when modelling CycloneDX BOM. diff --git a/cyclonedx/exception/output.py b/cyclonedx/exception/output.py index 7bdf45ce..c3109f13 100644 --- a/cyclonedx/exception/output.py +++ b/cyclonedx/exception/output.py @@ -11,7 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 -# +# Copyright (c) OWASP Foundation. All Rights Reserved. + """ Exceptions that are for specific error scenarios during the output of a Model to a SBOM. diff --git a/cyclonedx/model/bom.py b/cyclonedx/model/bom.py index a4670857..f3c2a840 100644 --- a/cyclonedx/model/bom.py +++ b/cyclonedx/model/bom.py @@ -14,6 +14,8 @@ # # SPDX-License-Identifier: Apache-2.0 # Copyright (c) OWASP Foundation. All Rights Reserved. + + import warnings from datetime import datetime from itertools import chain diff --git a/cyclonedx/output/__init__.py b/cyclonedx/output/__init__.py index fde15bc1..72126fbd 100644 --- a/cyclonedx/output/__init__.py +++ b/cyclonedx/output/__init__.py @@ -11,6 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 +# Copyright (c) OWASP Foundation. All Rights Reserved. + """ Set of classes and methods for outputting our libraries internal Bom model to CycloneDX documents in varying formats diff --git a/cyclonedx/parser/__init__.py b/cyclonedx/parser/__init__.py index c69cdf1c..6fdded1e 100644 --- a/cyclonedx/parser/__init__.py +++ b/cyclonedx/parser/__init__.py @@ -11,6 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 +# Copyright (c) OWASP Foundation. All Rights Reserved. + """ Set of classes and methods which allow for quick creation of a Bom instance from your environment or Python project. diff --git a/cyclonedx/schema/__init__.py b/cyclonedx/schema/__init__.py index ef2a696f..f0e38b05 100644 --- a/cyclonedx/schema/__init__.py +++ b/cyclonedx/schema/__init__.py @@ -11,6 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 +# Copyright (c) OWASP Foundation. All Rights Reserved. + from enum import Enum, auto, unique from typing import Any, Type, TypeVar diff --git a/cyclonedx/schema/_res/__init__.py b/cyclonedx/schema/_res/__init__.py index 8089d943..d33cf695 100644 --- a/cyclonedx/schema/_res/__init__.py +++ b/cyclonedx/schema/_res/__init__.py @@ -11,6 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 +# Copyright (c) OWASP Foundation. All Rights Reserved. + from os.path import dirname, join from typing import Dict, Optional diff --git a/cyclonedx/serialization/__init__.py b/cyclonedx/serialization/__init__.py index 925dd4d4..094b57f8 100644 --- a/cyclonedx/serialization/__init__.py +++ b/cyclonedx/serialization/__init__.py @@ -11,6 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 +# Copyright (c) OWASP Foundation. All Rights Reserved. + """ Set of helper classes for use with ``serializable`` when conducting (de-)serialization. diff --git a/cyclonedx/spdx.py b/cyclonedx/spdx.py index b7dfe052..98808d69 100644 --- a/cyclonedx/spdx.py +++ b/cyclonedx/spdx.py @@ -11,6 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 +# Copyright (c) OWASP Foundation. All Rights Reserved. + __all__ = [ 'is_supported_id', 'fixup_id', diff --git a/cyclonedx/validation/__init__.py b/cyclonedx/validation/__init__.py index 87f18335..fe0c3432 100644 --- a/cyclonedx/validation/__init__.py +++ b/cyclonedx/validation/__init__.py @@ -11,6 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 +# Copyright (c) OWASP Foundation. All Rights Reserved. + from abc import ABC, abstractmethod from importlib import import_module diff --git a/cyclonedx/validation/json.py b/cyclonedx/validation/json.py index 721dd5d7..3e6b38cb 100644 --- a/cyclonedx/validation/json.py +++ b/cyclonedx/validation/json.py @@ -11,6 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 +# Copyright (c) OWASP Foundation. All Rights Reserved. + __all__ = ['JsonValidator', 'JsonStrictValidator'] diff --git a/cyclonedx/validation/xml.py b/cyclonedx/validation/xml.py index 6da23b2a..0c65ffd1 100644 --- a/cyclonedx/validation/xml.py +++ b/cyclonedx/validation/xml.py @@ -11,6 +11,8 @@ # limitations under the License. # # SPDX-License-Identifier: Apache-2.0 +# Copyright (c) OWASP Foundation. All Rights Reserved. + __all__ = ['XmlValidator'] diff --git a/typings/sortedcontainers.pyi b/typings/sortedcontainers.pyi index b8e8b6f6..c9167837 100644 --- a/typings/sortedcontainers.pyi +++ b/typings/sortedcontainers.pyi @@ -1,9 +1,9 @@ # Correct as of 27 May 2022 # sortedcontainers does not have PEP561 type hints, and there are no published typeshed hints. -# The contents of this file were obtained from +# The contents of this file were obtained from # https://github.com/althonos/python-sortedcontainers/blob/d0a225d7fd0fb4c54532b8798af3cbeebf97e2d5/sortedcontainers/sortedset.pyi -from typing import ( # Iterator,; Tuple,; Type, +from typing import ( # Iterator,; Tuple,; Type, Set Any, Callable, Hashable, @@ -12,7 +12,6 @@ from typing import ( # Iterator,; Tuple,; Type, MutableSet, Optional, Sequence, - Set, TypeVar, Union, overload,