From bc15de99e1ddbf00547f1fa169e35239b9d3da5a Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Wed, 30 Apr 2025 10:15:18 +0200 Subject: [PATCH] ci: sort tools/ci/exclude_check_tools_files.txt --- .pre-commit-config.yaml | 7 ++- tools/ci/exclude_check_tools_files.txt | 80 +++++++++++++------------- tools/ci/idf_ci_local/app.py | 4 +- 3 files changed, 48 insertions(+), 43 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5fd48158e7..d506aa269a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -205,7 +205,12 @@ repos: rev: v4.0.1 hooks: - id: file-contents-sorter - files: 'tools\/ci\/(executable-list\.txt|mypy_ignore_list\.txt|check_copyright_ignore\.txt)' + files: "tools/ci/(\ + executable-list\\.txt\ + |mypy_ignore_list\\.txt\ + |check_copyright_ignore\\.txt\ + |exclude_check_tools_files\\.txt\ + )" - repo: https://github.com/espressif/check-copyright/ rev: v1.1.1 hooks: diff --git a/tools/ci/exclude_check_tools_files.txt b/tools/ci/exclude_check_tools_files.txt index 6dac35455d..7829449b5f 100644 --- a/tools/ci/exclude_check_tools_files.txt +++ b/tools/ci/exclude_check_tools_files.txt @@ -1,65 +1,65 @@ tools/ble/**/* +tools/bt/README.md +tools/bt/bt_hci_to_btsnoop.py tools/catch/**/* -tools/ci/check_*.py -tools/ci/check_*.txt -tools/ci/check_*.sh -tools/ci/check_copyright_config.yaml -tools/ci/get_all_test_results.py -tools/gdb_panic_server.py tools/check_term.py -tools/python_version_checker.py +tools/ci/*exclude*.txt +tools/ci/artifacts_handler.py tools/ci/astyle-rules.yml +tools/ci/check_*.py +tools/ci/check_*.sh +tools/ci/check_*.txt +tools/ci/check_copyright_config.yaml +tools/ci/check_test_files.py tools/ci/checkout_project_ref.py tools/ci/ci_fetch_submodule.py tools/ci/ci_get_mr_info.py tools/ci/ci_process_description.py +tools/ci/cleanup_ignore_lists.py tools/ci/configure_ci_environment.sh -tools/ci/generate_rules.py tools/ci/deploy_docs.py +tools/ci/dynamic_pipelines/**/* tools/ci/envsubst.py -tools/ci/*exclude*.txt tools/ci/executable-list.txt tools/ci/fix_empty_prototypes.sh +tools/ci/generate_rules.py tools/ci/get-full-sources.sh +tools/ci/get_all_test_results.py +tools/ci/get_known_failure_cases_file.py +tools/ci/get_supported_examples.sh +tools/ci/gitlab_yaml_linter.py +tools/ci/idf_build_apps_dump_soc_caps.py +tools/ci/idf_ci_local/**/* tools/ci/idf_ci_utils.py tools/ci/mirror-submodule-update.sh tools/ci/multirun_with_pyenv.sh tools/ci/mypy_ignore_list.txt +tools/ci/previous_stage_job_status.py tools/ci/push_to_github.sh -tools/ci/python_packages/wifi_tools.py -tools/ci/utils.sh -tools/eclipse-code-style.xml -tools/format.sh -tools/mocks/**/* -tools/set-submodules-to-github.sh -tools/templates/sample_project/main/main.c -tools/templates/sample_project/CMakeLists.txt -tools/templates/sample_project/main/CMakeLists.txt -tools/templates/sample_component/CMakeLists.txt -tools/templates/sample_component/include/main.h -tools/templates/sample_component/main.c -tools/ci/cleanup_ignore_lists.py -tools/ci/artifacts_handler.py -tools/ci/get_known_failure_cases_file.py -tools/unit-test-app/**/* -tools/ci/gitlab_yaml_linter.py -tools/ci/dynamic_pipelines/**/* -tools/ci/idf_ci_local/**/* -tools/ci/get_supported_examples.sh tools/ci/python_packages/common_test_methods.py tools/ci/python_packages/gitlab_api.py tools/ci/python_packages/idf_http_server_test/**/* tools/ci/python_packages/idf_iperf_test_util/**/* -tools/esp_prov/**/* -tools/ci/sort_yaml.py +tools/ci/python_packages/wifi_tools.py tools/ci/sg_rules/* -tools/ci/previous_stage_job_status.py -tools/legacy_exports/export_legacy.fish -tools/legacy_exports/export_legacy.sh -tools/legacy_exports/export_legacy.ps1 -tools/legacy_exports/export_legacy.bat -tools/ci/idf_build_apps_dump_soc_caps.py -tools/bt/bt_hci_to_btsnoop.py -tools/bt/README.md +tools/ci/sort_yaml.py tools/ci/test_linter.py -tools/ci/check_test_files.py +tools/ci/utils.sh +tools/eclipse-code-style.xml +tools/esp_prov/**/* +tools/format.sh +tools/gdb_panic_server.py +tools/legacy_exports/export_legacy.bat +tools/legacy_exports/export_legacy.fish +tools/legacy_exports/export_legacy.ps1 +tools/legacy_exports/export_legacy.sh +tools/mocks/**/* +tools/python_version_checker.py +tools/set-submodules-to-github.sh +tools/templates/sample_component/CMakeLists.txt +tools/templates/sample_component/include/main.h +tools/templates/sample_component/main.c +tools/templates/sample_project/CMakeLists.txt +tools/templates/sample_project/main/CMakeLists.txt +tools/templates/sample_project/main/main.c +tools/unit-test-app/**/* diff --git a/tools/ci/idf_ci_local/app.py b/tools/ci/idf_ci_local/app.py index 3dec01e949..cec367ca91 100644 --- a/tools/ci/idf_ci_local/app.py +++ b/tools/ci/idf_ci_local/app.py @@ -10,8 +10,8 @@ from idf_build_apps import App from idf_build_apps import CMakeApp from idf_build_apps import json_to_app -from idf_ci_local.uploader import AppUploader -from idf_ci_local.uploader import get_app_uploader +from .uploader import AppUploader +from .uploader import get_app_uploader class IdfCMakeApp(CMakeApp):