From e408915ff09c2755caf69cf688668f0faf24d3b8 Mon Sep 17 00:00:00 2001 From: Tomas Sebestik Date: Mon, 12 Apr 2021 08:36:09 +0200 Subject: [PATCH] Remove sorting of MYPY ignore list from py script Add sorting of mypy ignore list to pre-cm hook 'file-contents-sorter' --- .pre-commit-config.yaml | 2 +- tools/ci/check_type_comments.py | 3 --- tools/ci/mypy_ignore_list.txt | 24 ++++++++++++------------ 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 99a3fb9221..708f4c0404 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,7 +23,7 @@ repos: exclude: *whitespace_excludes - id: check-executables-have-shebangs - id: file-contents-sorter - files: 'tools/ci/executable-list.txt' + files: '(tools\/ci\/executable-list\.txt|tools\/ci\/mypy_ignore_list\.txt)' - id: mixed-line-ending args: ['-f=lf'] - id: double-quote-string-fixer diff --git a/tools/ci/check_type_comments.py b/tools/ci/check_type_comments.py index 3e415ad95d..4b41405269 100755 --- a/tools/ci/check_type_comments.py +++ b/tools/ci/check_type_comments.py @@ -66,9 +66,6 @@ def check_files(files): # type: (List[str]) -> List[str] if not types_valid(file_name): type_issues.append(file_name) - ignore_list.sort() - updated_list.sort() - if updated_list != ignore_list: with open(IGNORE_LIST_MYPY, 'w') as f: for item in updated_list: diff --git a/tools/ci/mypy_ignore_list.txt b/tools/ci/mypy_ignore_list.txt index dbe2d682eb..e2695f049f 100644 --- a/tools/ci/mypy_ignore_list.txt +++ b/tools/ci/mypy_ignore_list.txt @@ -1,9 +1,9 @@ components/app_update/otatool.py components/efuse/efuse_table_gen.py components/efuse/test_efuse_host/efuse_tests.py +components/esp32s2/test/gen_digital_signature_tests.py components/esp_local_ctrl/python/esp_local_ctrl_pb2.py components/esp_netif/test_apps/component_ut_test.py -components/esp32s2/test/gen_digital_signature_tests.py components/espcoredump/corefile/elf.py components/espcoredump/corefile/gdb.py components/espcoredump/corefile/loader.py @@ -92,8 +92,8 @@ examples/protocols/icmp_echo/example_test.py examples/protocols/mdns/mdns_example_test.py examples/protocols/modbus/serial/example_test.py examples/protocols/modbus/tcp/example_test.py -examples/protocols/mqtt/ssl_ds/configure_ds.py examples/protocols/mqtt/ssl/mqtt_ssl_example_test.py +examples/protocols/mqtt/ssl_ds/configure_ds.py examples/protocols/mqtt/tcp/mqtt_tcp_example_test.py examples/protocols/mqtt/ws/mqtt_ws_example_test.py examples/protocols/mqtt/wss/mqtt_wss_example_test.py @@ -111,8 +111,8 @@ examples/provisioning/wifi_prov_mgr/wifi_prov_mgr_test.py examples/security/flash_encryption/example_test.py examples/storage/ext_flash_fatfs/example_test.py examples/storage/nvs_rw_blob/nvs_rw_blob_example_test.py -examples/storage/nvs_rw_value_cxx/nvs_rw_value_cxx_example_test.py examples/storage/nvs_rw_value/nvs_rw_value_example_test.py +examples/storage/nvs_rw_value_cxx/nvs_rw_value_cxx_example_test.py examples/storage/partition_api/partition_find/partition_find_example_test.py examples/storage/partition_api/partition_mmap/partition_mmap_example_test.py examples/storage/partition_api/partition_ops/partition_ops_example_test.py @@ -143,11 +143,11 @@ examples/system/ota/otatool/otatool_example.py examples/system/ota/simple_ota_example/example_test.py examples/system/perfmon/example_test.py examples/system/select/example_test.py -examples/system/sysview_tracing_heap_log/example_test.py examples/system/sysview_tracing/example_test.py +examples/system/sysview_tracing_heap_log/example_test.py examples/system/task_watchdog/example_test.py -examples/system/ulp_adc/example_test.py examples/system/ulp/example_test.py +examples/system/ulp_adc/example_test.py examples/system/unit_test/example_test.py examples/wifi/iperf/iperf_test.py tools/ble/lib_ble_client.py @@ -183,18 +183,18 @@ tools/ci/python_packages/idf_iperf_test_util/LineChart.py tools/ci/python_packages/idf_iperf_test_util/PowerControl.py tools/ci/python_packages/idf_iperf_test_util/TestReport.py tools/ci/python_packages/tiny_test_fw/App.py -tools/ci/python_packages/tiny_test_fw/bin/example.py -tools/ci/python_packages/tiny_test_fw/bin/Runner.py -tools/ci/python_packages/tiny_test_fw/docs/conf.py tools/ci/python_packages/tiny_test_fw/DUT.py tools/ci/python_packages/tiny_test_fw/Env.py tools/ci/python_packages/tiny_test_fw/EnvConfig.py tools/ci/python_packages/tiny_test_fw/TinyFW.py -tools/ci/python_packages/tiny_test_fw/Utility/CaseConfig.py tools/ci/python_packages/tiny_test_fw/Utility/CIAssignTest.py +tools/ci/python_packages/tiny_test_fw/Utility/CaseConfig.py tools/ci/python_packages/tiny_test_fw/Utility/GitlabCIJob.py tools/ci/python_packages/tiny_test_fw/Utility/SearchCases.py tools/ci/python_packages/tiny_test_fw/Utility/TestCase.py +tools/ci/python_packages/tiny_test_fw/bin/Runner.py +tools/ci/python_packages/tiny_test_fw/bin/example.py +tools/ci/python_packages/tiny_test_fw/docs/conf.py tools/ci/python_packages/ttfw_idf/CIScanTests.py tools/ci/python_packages/ttfw_idf/DebugUtils.py tools/ci/python_packages/ttfw_idf/IDFApp.py @@ -217,10 +217,10 @@ tools/esp_prov/security/security.py tools/esp_prov/security/security0.py tools/esp_prov/security/security1.py tools/esp_prov/transport/ble_cli.py +tools/esp_prov/transport/transport.py tools/esp_prov/transport/transport_ble.py tools/esp_prov/transport/transport_console.py tools/esp_prov/transport/transport_http.py -tools/esp_prov/transport/transport.py tools/esp_prov/utils/convenience.py tools/find_apps.py tools/find_build_apps/cmake.py @@ -228,6 +228,7 @@ tools/find_build_apps/common.py tools/find_build_apps/make.py tools/gdb_panic_server.py tools/gen_esp_err_to_name.py +tools/idf.py tools/idf_monitor.py tools/idf_py_actions/constants.py tools/idf_py_actions/core_ext.py @@ -240,7 +241,6 @@ tools/idf_py_actions/serial_ext.py tools/idf_py_actions/tools.py tools/idf_py_actions/uf2_ext.py tools/idf_size.py -tools/idf.py tools/kconfig_new/confgen.py tools/kconfig_new/confserver.py tools/kconfig_new/esp-windows-curses/setup.py @@ -252,8 +252,8 @@ tools/kconfig_new/test/gen_kconfig_doc/test_kconfig_out.py tools/kconfig_new/test/gen_kconfig_doc/test_target_visibility.py tools/ldgen/fragments.py tools/ldgen/generation.py -tools/ldgen/ldgen_common.py tools/ldgen/ldgen.py +tools/ldgen/ldgen_common.py tools/ldgen/linker_script.py tools/ldgen/output_commands.py tools/ldgen/sdkconfig.py