diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 2249d149..18c0946d 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -42,4 +40,4 @@ python: install: - method: pip path: . - - requirements: docs/requirements.txt \ No newline at end of file + - requirements: docs/requirements.txt diff --git a/cyclonedx/__init__.py b/cyclonedx/__init__.py index 53b0998a..449a92d8 100644 --- a/cyclonedx/__init__.py +++ b/cyclonedx/__init__.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/exception/__init__.py b/cyclonedx/exception/__init__.py index 1845b006..72752a73 100644 --- a/cyclonedx/exception/__init__.py +++ b/cyclonedx/exception/__init__.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/exception/factory.py b/cyclonedx/exception/factory.py index 87540f85..5211f9e8 100644 --- a/cyclonedx/exception/factory.py +++ b/cyclonedx/exception/factory.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/exception/model.py b/cyclonedx/exception/model.py index f0c07383..5481983c 100644 --- a/cyclonedx/exception/model.py +++ b/cyclonedx/exception/model.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/exception/output.py b/cyclonedx/exception/output.py index 4dbb7078..7bdf45ce 100644 --- a/cyclonedx/exception/output.py +++ b/cyclonedx/exception/output.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/factory/__init__.py b/cyclonedx/factory/__init__.py index 4cf62cdc..50e0bf37 100644 --- a/cyclonedx/factory/__init__.py +++ b/cyclonedx/factory/__init__.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/factory/license.py b/cyclonedx/factory/license.py index 5d21c012..9974c046 100644 --- a/cyclonedx/factory/license.py +++ b/cyclonedx/factory/license.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/model/__init__.py b/cyclonedx/model/__init__.py index 47f709a1..53beba00 100644 --- a/cyclonedx/model/__init__.py +++ b/cyclonedx/model/__init__.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/model/bom.py b/cyclonedx/model/bom.py index a66ba0c6..67f04ed6 100644 --- a/cyclonedx/model/bom.py +++ b/cyclonedx/model/bom.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cyclonedx/model/bom_ref.py b/cyclonedx/model/bom_ref.py index 79dad0a3..bd35f1ff 100644 --- a/cyclonedx/model/bom_ref.py +++ b/cyclonedx/model/bom_ref.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cyclonedx/model/component.py b/cyclonedx/model/component.py index f3fd386d..516e11b7 100644 --- a/cyclonedx/model/component.py +++ b/cyclonedx/model/component.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cyclonedx/model/dependency.py b/cyclonedx/model/dependency.py index d275b160..34155874 100644 --- a/cyclonedx/model/dependency.py +++ b/cyclonedx/model/dependency.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cyclonedx/model/impact_analysis.py b/cyclonedx/model/impact_analysis.py index 830912f6..16d5914b 100644 --- a/cyclonedx/model/impact_analysis.py +++ b/cyclonedx/model/impact_analysis.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cyclonedx/model/issue.py b/cyclonedx/model/issue.py index 8584fb0a..722cb5b6 100644 --- a/cyclonedx/model/issue.py +++ b/cyclonedx/model/issue.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/model/release_note.py b/cyclonedx/model/release_note.py index c5164352..4464f587 100644 --- a/cyclonedx/model/release_note.py +++ b/cyclonedx/model/release_note.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cyclonedx/model/service.py b/cyclonedx/model/service.py index 7dbbccf7..16efea3a 100644 --- a/cyclonedx/model/service.py +++ b/cyclonedx/model/service.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/model/vulnerability.py b/cyclonedx/model/vulnerability.py index 07f284a3..4742db42 100644 --- a/cyclonedx/model/vulnerability.py +++ b/cyclonedx/model/vulnerability.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cyclonedx/output/__init__.py b/cyclonedx/output/__init__.py index 474a710d..b126501d 100644 --- a/cyclonedx/output/__init__.py +++ b/cyclonedx/output/__init__.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/output/json.py b/cyclonedx/output/json.py index c4ba023d..2f6c4c77 100644 --- a/cyclonedx/output/json.py +++ b/cyclonedx/output/json.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cyclonedx/output/xml.py b/cyclonedx/output/xml.py index 8642ec50..9bbf945d 100644 --- a/cyclonedx/output/xml.py +++ b/cyclonedx/output/xml.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cyclonedx/parser/__init__.py b/cyclonedx/parser/__init__.py index 1589f3cd..c69cdf1c 100644 --- a/cyclonedx/parser/__init__.py +++ b/cyclonedx/parser/__init__.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/schema/__init__.py b/cyclonedx/schema/__init__.py index 361dcbca..fbbe92d7 100644 --- a/cyclonedx/schema/__init__.py +++ b/cyclonedx/schema/__init__.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/schema/_res/__init__.py b/cyclonedx/schema/_res/__init__.py index 13b30823..8089d943 100644 --- a/cyclonedx/schema/_res/__init__.py +++ b/cyclonedx/schema/_res/__init__.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/schema/schema.py b/cyclonedx/schema/schema.py index 5de943db..cb5d1e27 100644 --- a/cyclonedx/schema/schema.py +++ b/cyclonedx/schema/schema.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cyclonedx/serialization/__init__.py b/cyclonedx/serialization/__init__.py index 7e84379e..925dd4d4 100644 --- a/cyclonedx/serialization/__init__.py +++ b/cyclonedx/serialization/__init__.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/spdx.py b/cyclonedx/spdx.py index 6a684f97..3eae6221 100644 --- a/cyclonedx/spdx.py +++ b/cyclonedx/spdx.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/validation/__init__.py b/cyclonedx/validation/__init__.py index 445613f3..e8b207de 100644 --- a/cyclonedx/validation/__init__.py +++ b/cyclonedx/validation/__init__.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/validation/json.py b/cyclonedx/validation/json.py index edf4616f..d97d276c 100644 --- a/cyclonedx/validation/json.py +++ b/cyclonedx/validation/json.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/cyclonedx/validation/xml.py b/cyclonedx/validation/xml.py index 2fbb585e..66890316 100644 --- a/cyclonedx/validation/xml.py +++ b/cyclonedx/validation/xml.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/docs/conf.py b/docs/conf.py index 5abdefc5..f6672dbc 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/examples/complex.py b/examples/complex.py index a2f5fb6f..4c291b2d 100644 --- a/examples/complex.py +++ b/examples/complex.py @@ -1,3 +1,20 @@ +# This file is part of CycloneDX Python Lib +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# Copyright (c) OWASP Foundation. All Rights Reserved. + import sys from packageurl import PackageURL diff --git a/tests/__init__.py b/tests/__init__.py index 0b497f9e..ff33a2b8 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/base.py b/tests/base.py index 5d4fec7d..371b53c6 100644 --- a/tests/base.py +++ b/tests/base.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/data.py b/tests/data.py index d0d3afb5..3d882931 100644 --- a/tests/data.py +++ b/tests/data.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_component.py b/tests/test_component.py index baa57830..a344d880 100644 --- a/tests/test_component.py +++ b/tests/test_component.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_deserialize_json.py b/tests/test_deserialize_json.py index bb9b626f..1f07252f 100644 --- a/tests/test_deserialize_json.py +++ b/tests/test_deserialize_json.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_deserialize_xml.py b/tests/test_deserialize_xml.py index f1a95577..f9502fb4 100644 --- a/tests/test_deserialize_xml.py +++ b/tests/test_deserialize_xml.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_e2e_environment.py b/tests/test_e2e_environment.py index 165fc9d9..3a7460ea 100644 --- a/tests/test_e2e_environment.py +++ b/tests/test_e2e_environment.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_factory_license.py b/tests/test_factory_license.py index 00798967..022f6ac2 100644 --- a/tests/test_factory_license.py +++ b/tests/test_factory_license.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_model.py b/tests/test_model.py index 0ee5b3bd..edbe7a9c 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_model_bom.py b/tests/test_model_bom.py index 18567c72..50897ef4 100644 --- a/tests/test_model_bom.py +++ b/tests/test_model_bom.py @@ -1,4 +1,21 @@ -# encoding: utf-8 +# This file is part of CycloneDX Python Lib +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# Copyright (c) OWASP Foundation. All Rights Reserved. + + from typing import Callable from unittest import TestCase from uuid import uuid4 @@ -31,23 +48,6 @@ get_component_setuptools_simple_no_version, ) -# This file is part of CycloneDX Python Lib -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# Copyright (c) OWASP Foundation. All Rights Reserved. - class TestBomMetaData(TestCase): diff --git a/tests/test_model_bom_ref.py b/tests/test_model_bom_ref.py index f7ae4a48..955469bc 100644 --- a/tests/test_model_bom_ref.py +++ b/tests/test_model_bom_ref.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_model_component.py b/tests/test_model_component.py index eeb2fda6..bb58049b 100644 --- a/tests/test_model_component.py +++ b/tests/test_model_component.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_model_dependency.py b/tests/test_model_dependency.py index 40186a70..165bcfca 100644 --- a/tests/test_model_dependency.py +++ b/tests/test_model_dependency.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_model_issue.py b/tests/test_model_issue.py index 383df5d4..bc156169 100644 --- a/tests/test_model_issue.py +++ b/tests/test_model_issue.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_model_release_note.py b/tests/test_model_release_note.py index a06025af..c65f1ad2 100644 --- a/tests/test_model_release_note.py +++ b/tests/test_model_release_note.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_model_service.py b/tests/test_model_service.py index 909aa2b1..588cf2d5 100644 --- a/tests/test_model_service.py +++ b/tests/test_model_service.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_model_vulnerability.py b/tests/test_model_vulnerability.py index c3e33134..257b82a8 100644 --- a/tests/test_model_vulnerability.py +++ b/tests/test_model_vulnerability.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_output.py b/tests/test_output.py index 90e991a1..71a1b995 100644 --- a/tests/test_output.py +++ b/tests/test_output.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_output_generic.py b/tests/test_output_generic.py index 7325cbee..c664e50f 100644 --- a/tests/test_output_generic.py +++ b/tests/test_output_generic.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_output_json.py b/tests/test_output_json.py index be72360b..f4080262 100644 --- a/tests/test_output_json.py +++ b/tests/test_output_json.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_output_xml.py b/tests/test_output_xml.py index dc6e1989..5303cb9f 100644 --- a/tests/test_output_xml.py +++ b/tests/test_output_xml.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_real_world_examples.py b/tests/test_real_world_examples.py index 6ce3cf90..7be3b081 100644 --- a/tests/test_real_world_examples.py +++ b/tests/test_real_world_examples.py @@ -1,4 +1,3 @@ -# encoding: utf-8 # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_schema_SchemaVersion.py b/tests/test_schema_SchemaVersion.py index 988b5fe0..912c43b2 100644 --- a/tests/test_schema_SchemaVersion.py +++ b/tests/test_schema_SchemaVersion.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_schema__res.py b/tests/test_schema__res.py index 93981bcc..930d3709 100644 --- a/tests/test_schema__res.py +++ b/tests/test_schema__res.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_spdx.py b/tests/test_spdx.py index 98c51dc6..b5ea6cde 100644 --- a/tests/test_spdx.py +++ b/tests/test_spdx.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_validation.py b/tests/test_validation.py index b7e3dfbd..eae92c93 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_validation_json.py b/tests/test_validation_json.py index 18edb10b..45f06179 100644 --- a/tests/test_validation_json.py +++ b/tests/test_validation_json.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_validation_xml.py b/tests/test_validation_xml.py index 60bc749c..a08c932d 100644 --- a/tests/test_validation_xml.py +++ b/tests/test_validation_xml.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # This file is part of CycloneDX Python Lib # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/schema-downloader.py b/tools/schema-downloader.py index 928b0010..6027117f 100644 --- a/tools/schema-downloader.py +++ b/tools/schema-downloader.py @@ -1,8 +1,3 @@ -# encoding: utf-8 -import re -from os.path import dirname, join -from urllib.request import urlretrieve - # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -17,6 +12,9 @@ # # SPDX-License-Identifier: Apache-2.0 +import re +from os.path import dirname, join +from urllib.request import urlretrieve SOURCE_ROOT = 'https://raw.githubusercontent.com/CycloneDX/specification/master/schema/' TARGET_ROOT = join(dirname(__file__), '..', 'cyclonedx', 'schema', '_res')