Эх сурвалжийг харах

Merge branch 'refactor/change_copyright_in_tools' into 'master'

idf.py: Change copyright in tools code owner's files

See merge request espressif/esp-idf!18215
Roland Dobai 3 жил өмнө
parent
commit
64b6733349
36 өөрчлөгдсөн 69 нэмэгдсэн , 259 устгасан
  1. 0 34
      tools/ci/check_copyright_ignore.txt
  2. 0 1
      tools/ci/mypy_ignore_list.txt
  3. 3 4
      tools/esp_app_trace/espytrace/apptrace.py
  4. 2 0
      tools/esp_app_trace/espytrace/sysview.py
  5. 2 0
      tools/esp_app_trace/logtrace_proc.py
  6. 2 13
      tools/esp_app_trace/sysviewtrace_proc.py
  7. 2 13
      tools/gdb_panic_server.py
  8. 2 13
      tools/idf_monitor_base/chip_specific_config.py
  9. 2 13
      tools/idf_monitor_base/console_reader.py
  10. 2 0
      tools/idf_monitor_base/coredump.py
  11. 2 13
      tools/idf_monitor_base/exceptions.py
  12. 2 0
      tools/idf_monitor_base/gdbhelper.py
  13. 2 13
      tools/idf_monitor_base/line_matcher.py
  14. 2 13
      tools/idf_monitor_base/logger.py
  15. 2 13
      tools/idf_monitor_base/output_helpers.py
  16. 2 13
      tools/idf_monitor_base/stoppable_thread.py
  17. 2 13
      tools/idf_monitor_base/web_socket_client.py
  18. 2 0
      tools/idf_py_actions/constants.py
  19. 2 0
      tools/idf_py_actions/core_ext.py
  20. 2 0
      tools/idf_py_actions/create_ext.py
  21. 2 0
      tools/idf_py_actions/debug_ext.py
  22. 2 0
      tools/idf_py_actions/dfu_ext.py
  23. 2 0
      tools/idf_py_actions/errors.py
  24. 2 0
      tools/idf_py_actions/global_options.py
  25. 2 0
      tools/idf_py_actions/tools.py
  26. 2 0
      tools/idf_py_actions/uf2_ext.py
  27. 2 13
      tools/mkdfu.py
  28. 2 19
      tools/mkuf2.py
  29. 2 0
      tools/test_idf_py/extra_path/some_ext.py
  30. 2 0
      tools/test_idf_py/idf_ext.py
  31. 2 0
      tools/test_idf_py/test_idf_extensions/test_ext/__init__.py
  32. 2 0
      tools/test_idf_py/test_idf_extensions/test_ext/test_extension.py
  33. 2 13
      tools/test_idf_py/test_idf_py.py
  34. 2 13
      tools/test_idf_size/test_idf_size.py
  35. 2 13
      tools/test_mkdfu/test_mkdfu.py
  36. 2 19
      tools/test_mkuf2/test_mkuf2.py

+ 0 - 34
tools/ci/check_copyright_ignore.txt

@@ -2347,10 +2347,6 @@ tools/ci/python_packages/ttfw_idf/IDFAssignTest.py
 tools/ci/python_packages/ttfw_idf/unity_test_parser.py
 tools/ci/python_packages/ttfw_idf/unity_test_parser.py
 tools/ci/python_packages/wifi_tools.py
 tools/ci/python_packages/wifi_tools.py
 tools/ci/test_autocomplete.py
 tools/ci/test_autocomplete.py
-tools/esp_app_trace/espytrace/apptrace.py
-tools/esp_app_trace/espytrace/sysview.py
-tools/esp_app_trace/logtrace_proc.py
-tools/esp_app_trace/sysviewtrace_proc.py
 tools/esp_app_trace/test/sysview/blink.c
 tools/esp_app_trace/test/sysview/blink.c
 tools/esp_prov/__init__.py
 tools/esp_prov/__init__.py
 tools/esp_prov/prov/__init__.py
 tools/esp_prov/prov/__init__.py
@@ -2372,26 +2368,6 @@ tools/find_apps.py
 tools/find_build_apps/__init__.py
 tools/find_build_apps/__init__.py
 tools/find_build_apps/cmake.py
 tools/find_build_apps/cmake.py
 tools/find_build_apps/common.py
 tools/find_build_apps/common.py
-tools/gdb_panic_server.py
-tools/idf_monitor_base/chip_specific_config.py
-tools/idf_monitor_base/console_reader.py
-tools/idf_monitor_base/coredump.py
-tools/idf_monitor_base/exceptions.py
-tools/idf_monitor_base/gdbhelper.py
-tools/idf_monitor_base/line_matcher.py
-tools/idf_monitor_base/logger.py
-tools/idf_monitor_base/output_helpers.py
-tools/idf_monitor_base/stoppable_thread.py
-tools/idf_monitor_base/web_socket_client.py
-tools/idf_py_actions/constants.py
-tools/idf_py_actions/core_ext.py
-tools/idf_py_actions/create_ext.py
-tools/idf_py_actions/debug_ext.py
-tools/idf_py_actions/dfu_ext.py
-tools/idf_py_actions/errors.py
-tools/idf_py_actions/global_options.py
-tools/idf_py_actions/tools.py
-tools/idf_py_actions/uf2_ext.py
 tools/kconfig_new/confserver.py
 tools/kconfig_new/confserver.py
 tools/kconfig_new/gen_kconfig_doc.py
 tools/kconfig_new/gen_kconfig_doc.py
 tools/kconfig_new/test/confgen/test_confgen.py
 tools/kconfig_new/test/confgen/test_confgen.py
@@ -2405,8 +2381,6 @@ tools/ldgen/samples/template.ld
 tools/ldgen/sdkconfig.py
 tools/ldgen/sdkconfig.py
 tools/ldgen/test/data/linker_script.ld
 tools/ldgen/test/data/linker_script.ld
 tools/mass_mfg/mfg_gen.py
 tools/mass_mfg/mfg_gen.py
-tools/mkdfu.py
-tools/mkuf2.py
 tools/mocks/esp_system/include/esp_task.h
 tools/mocks/esp_system/include/esp_task.h
 tools/templates/sample_component/include/main.h
 tools/templates/sample_component/include/main.h
 tools/templates/sample_component/main.c
 tools/templates/sample_component/main.c
@@ -2457,14 +2431,6 @@ tools/test_apps/system/panic/test_panic_util/test_panic_util.py
 tools/test_apps/system/startup/app_test.py
 tools/test_apps/system/startup/app_test.py
 tools/test_apps/system/startup/main/test_startup_main.c
 tools/test_apps/system/startup/main/test_startup_main.c
 tools/test_idf_monitor/dummy.c
 tools/test_idf_monitor/dummy.c
-tools/test_idf_py/extra_path/some_ext.py
-tools/test_idf_py/idf_ext.py
-tools/test_idf_py/test_idf_extensions/test_ext/__init__.py
-tools/test_idf_py/test_idf_extensions/test_ext/test_extension.py
-tools/test_idf_py/test_idf_py.py
-tools/test_idf_size/test_idf_size.py
-tools/test_mkdfu/test_mkdfu.py
-tools/test_mkuf2/test_mkuf2.py
 tools/unit-test-app/components/test_utils/ccomp_timer.c
 tools/unit-test-app/components/test_utils/ccomp_timer.c
 tools/unit-test-app/components/test_utils/include/ccomp_timer.h
 tools/unit-test-app/components/test_utils/include/ccomp_timer.h
 tools/unit-test-app/components/test_utils/private_include/ccomp_timer_impl.h
 tools/unit-test-app/components/test_utils/private_include/ccomp_timer_impl.h

+ 0 - 1
tools/ci/mypy_ignore_list.txt

@@ -217,7 +217,6 @@ tools/idf_py_actions/create_ext.py
 tools/idf_py_actions/debug_ext.py
 tools/idf_py_actions/debug_ext.py
 tools/idf_py_actions/dfu_ext.py
 tools/idf_py_actions/dfu_ext.py
 tools/idf_py_actions/errors.py
 tools/idf_py_actions/errors.py
-tools/idf_py_actions/global_options.py
 tools/idf_py_actions/serial_ext.py
 tools/idf_py_actions/serial_ext.py
 tools/idf_py_actions/tools.py
 tools/idf_py_actions/tools.py
 tools/idf_py_actions/uf2_ext.py
 tools/idf_py_actions/uf2_ext.py

+ 3 - 4
tools/esp_app_trace/espytrace/apptrace.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 from __future__ import print_function
 from __future__ import print_function
 
 
 import os
 import os
@@ -7,12 +9,9 @@ try:
     from urlparse import urlparse
     from urlparse import urlparse
 except ImportError:
 except ImportError:
     from urllib.parse import urlparse
     from urllib.parse import urlparse
-try:
-    import SocketServer
-except ImportError:
-    import socketserver as SocketServer
 
 
 import os.path
 import os.path
+import socketserver as SocketServer
 import subprocess
 import subprocess
 import tempfile
 import tempfile
 import threading
 import threading

+ 2 - 0
tools/esp_app_trace/espytrace/sysview.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 import copy
 import copy
 import json
 import json
 import re
 import re

+ 2 - 0
tools/esp_app_trace/logtrace_proc.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
 #!/usr/bin/env python
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 #
 #
 
 
 from __future__ import print_function
 from __future__ import print_function

+ 2 - 13
tools/esp_app_trace/sysviewtrace_proc.py

@@ -1,18 +1,7 @@
 #!/usr/bin/env python
 #!/usr/bin/env python
 #
 #
-# Copyright 2019 Espressif Systems (Shanghai) PTE LTD
-#
-# 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-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 #
 #
 # This is python script to process various types trace data streams in SystemView format.
 # This is python script to process various types trace data streams in SystemView format.
 # Trace data can be provided in multiple trace files (one per CPU). After processing phase
 # Trace data can be provided in multiple trace files (one per CPU). After processing phase

+ 2 - 13
tools/gdb_panic_server.py

@@ -15,19 +15,8 @@
 # The approach is inspired by Cesanta's ESP8266 GDB server:
 # The approach is inspired by Cesanta's ESP8266 GDB server:
 # https://github.com/cesanta/mongoose-os/blob/27777c8977/platforms/esp8266/tools/serve_core.py
 # https://github.com/cesanta/mongoose-os/blob/27777c8977/platforms/esp8266/tools/serve_core.py
 #
 #
-# Copyright 2020 Espressif Systems (Shanghai) Co. Ltd.
-#
-# 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-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 #
 #
 
 
 
 

+ 2 - 13
tools/idf_monitor_base/chip_specific_config.py

@@ -1,16 +1,5 @@
-# Copyright 2015-2021 Espressif Systems (Shanghai) CO LTD
-#
-# 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-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 #
 #
 # This file contains values (e.g. delay time, ...) that are different for each chip for a particular action.
 # This file contains values (e.g. delay time, ...) that are different for each chip for a particular action.
 # If adding a new device, set only values that are different from the default, e.g.:
 # If adding a new device, set only values that are different from the default, e.g.:

+ 2 - 13
tools/idf_monitor_base/console_reader.py

@@ -1,16 +1,5 @@
-# Copyright 2015-2021 Espressif Systems (Shanghai) CO LTD
-#
-# 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-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 
 
 
 
 import os
 import os

+ 2 - 0
tools/idf_monitor_base/coredump.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 import io
 import io
 import os
 import os
 import queue
 import queue

+ 2 - 13
tools/idf_monitor_base/exceptions.py

@@ -1,16 +1,5 @@
-# Copyright 2015-2021 Espressif Systems (Shanghai) CO LTD
-#
-# 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-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 
 
 class SerialStopException(Exception):
 class SerialStopException(Exception):
     """
     """

+ 2 - 0
tools/idf_monitor_base/gdbhelper.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 import os
 import os
 import re
 import re
 import subprocess
 import subprocess

+ 2 - 13
tools/idf_monitor_base/line_matcher.py

@@ -1,16 +1,5 @@
-# Copyright 2015-2021 Espressif Systems (Shanghai) CO LTD
-#
-# 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-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 
 
 import re
 import re
 
 

+ 2 - 13
tools/idf_monitor_base/logger.py

@@ -1,16 +1,5 @@
-# Copyright 2015-2021 Espressif Systems (Shanghai) CO LTD
-#
-# 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-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 
 
 import datetime
 import datetime
 import os
 import os

+ 2 - 13
tools/idf_monitor_base/output_helpers.py

@@ -1,16 +1,5 @@
-# Copyright 2015-2021 Espressif Systems (Shanghai) CO LTD
-#
-# 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-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 
 
 import subprocess
 import subprocess
 import sys
 import sys

+ 2 - 13
tools/idf_monitor_base/stoppable_thread.py

@@ -1,16 +1,5 @@
-# Copyright 2015-2021 Espressif Systems (Shanghai) CO LTD
-#
-# 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-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 
 
 import threading
 import threading
 from typing import Optional
 from typing import Optional

+ 2 - 13
tools/idf_monitor_base/web_socket_client.py

@@ -1,16 +1,5 @@
-# Copyright 2015-2021 Espressif Systems (Shanghai) CO LTD
-#
-# 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-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 
 
 import json
 import json
 import time
 import time

+ 2 - 0
tools/idf_py_actions/constants.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 import collections
 import collections
 import multiprocessing
 import multiprocessing
 import os
 import os

+ 2 - 0
tools/idf_py_actions/core_ext.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 import fnmatch
 import fnmatch
 import locale
 import locale
 import os
 import os

+ 2 - 0
tools/idf_py_actions/create_ext.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 from __future__ import print_function
 from __future__ import print_function
 
 
 import os
 import os

+ 2 - 0
tools/idf_py_actions/debug_ext.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 import json
 import json
 import os
 import os
 import re
 import re

+ 2 - 0
tools/idf_py_actions/dfu_ext.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 from idf_py_actions.errors import FatalError
 from idf_py_actions.errors import FatalError
 from idf_py_actions.tools import ensure_build_directory, is_target_supported, run_target
 from idf_py_actions.tools import ensure_build_directory, is_target_supported, run_target
 
 

+ 2 - 0
tools/idf_py_actions/errors.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 class FatalError(RuntimeError):
 class FatalError(RuntimeError):
     """
     """
     Wrapper class for runtime errors that aren't caused by bugs in idf.py or the build process.
     Wrapper class for runtime errors that aren't caused by bugs in idf.py or the build process.

+ 2 - 0
tools/idf_py_actions/global_options.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 global_options = [{
 global_options = [{
     'names': ['-D', '--define-cache-entry'],
     'names': ['-D', '--define-cache-entry'],
     'help': 'Create a cmake cache entry.',
     'help': 'Create a cmake cache entry.',

+ 2 - 0
tools/idf_py_actions/tools.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 import os
 import os
 import re
 import re
 import subprocess
 import subprocess

+ 2 - 0
tools/idf_py_actions/uf2_ext.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 from idf_py_actions.tools import ensure_build_directory, run_target
 from idf_py_actions.tools import ensure_build_directory, run_target
 
 
 
 

+ 2 - 13
tools/mkdfu.py

@@ -1,18 +1,7 @@
 #!/usr/bin/env python
 #!/usr/bin/env python
 #
 #
-# Copyright 2020-2021 Espressif Systems (Shanghai) CO LTD
-#
-# 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-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 #
 #
 # This program creates archives compatible with ESP32-S* ROM DFU implementation.
 # This program creates archives compatible with ESP32-S* ROM DFU implementation.
 #
 #

+ 2 - 19
tools/mkuf2.py

@@ -1,18 +1,7 @@
 #!/usr/bin/env python
 #!/usr/bin/env python
 #
 #
-# Copyright 2020 Espressif Systems (Shanghai) CO LTD
-#
-# 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-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 
 
 from __future__ import division
 from __future__ import division
 
 
@@ -25,12 +14,6 @@ from functools import partial
 
 
 from future.utils import iteritems
 from future.utils import iteritems
 
 
-try:
-    from itertools import izip as zip
-except ImportError:
-    # Python 3
-    pass
-
 
 
 def round_up_int_div(n, d):
 def round_up_int_div(n, d):
     # equivalent to math.ceil(n / d)
     # equivalent to math.ceil(n / d)

+ 2 - 0
tools/test_idf_py/extra_path/some_ext.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 def action_extensions(base_actions, project_path):
 def action_extensions(base_actions, project_path):
     def some_callback(ut_apply_config_name, ctx, args):
     def some_callback(ut_apply_config_name, ctx, args):
         print('!!! From some subcommand')
         print('!!! From some subcommand')

+ 2 - 0
tools/test_idf_py/idf_ext.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 def action_extensions(base_actions, project_path=None):
 def action_extensions(base_actions, project_path=None):
     def echo(name, *args, **kwargs):
     def echo(name, *args, **kwargs):
         print(name, args, kwargs)
         print(name, args, kwargs)

+ 2 - 0
tools/test_idf_py/test_idf_extensions/test_ext/__init__.py

@@ -1 +1,3 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 from .test_extension import action_extensions  # noqa: F401
 from .test_extension import action_extensions  # noqa: F401

+ 2 - 0
tools/test_idf_py/test_idf_extensions/test_ext/test_extension.py

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 import os
 import os
 
 
 
 

+ 2 - 13
tools/test_idf_py/test_idf_py.py

@@ -1,18 +1,7 @@
 #!/usr/bin/env python
 #!/usr/bin/env python
 #
 #
-# Copyright 2019 Espressif Systems (Shanghai) CO LTD
-#
-# 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-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 
 
 import os
 import os
 import subprocess
 import subprocess

+ 2 - 13
tools/test_idf_size/test_idf_size.py

@@ -1,18 +1,7 @@
 #!/usr/bin/env python
 #!/usr/bin/env python
 #
 #
-# Copyright 2018 Espressif Systems (Shanghai) PTE LTD
-#
-# 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-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 
 
 from __future__ import print_function
 from __future__ import print_function
 
 

+ 2 - 13
tools/test_mkdfu/test_mkdfu.py

@@ -1,19 +1,8 @@
 #!/usr/bin/env python
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
 #
 #
-# Copyright 2020-2021 Espressif Systems (Shanghai) CO LTD
-#
-# 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-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 
 
 from __future__ import unicode_literals
 from __future__ import unicode_literals
 
 

+ 2 - 19
tools/test_mkuf2/test_mkuf2.py

@@ -1,19 +1,8 @@
 #!/usr/bin/env python
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
 #
 #
-# Copyright 2020 Espressif Systems (Shanghai) CO LTD
-#
-# 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-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 
 
 from __future__ import unicode_literals
 from __future__ import unicode_literals
 
 
@@ -32,12 +21,6 @@ from itertools import chain
 
 
 import pexpect
 import pexpect
 
 
-try:
-    from itertools import izip as zip
-except ImportError:
-    # Python 3
-    pass
-
 current_dir = os.path.dirname(os.path.realpath(__file__))
 current_dir = os.path.dirname(os.path.realpath(__file__))
 mkuf2_dir = os.path.abspath(os.path.join(current_dir, '..'))
 mkuf2_dir = os.path.abspath(os.path.join(current_dir, '..'))
 mkuf2_path = os.path.join(mkuf2_dir, 'mkuf2.py')
 mkuf2_path = os.path.join(mkuf2_dir, 'mkuf2.py')