diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 708f4c0404c7..043c53333568 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,8 +22,6 @@ repos: - id: end-of-file-fixer exclude: *whitespace_excludes - id: check-executables-have-shebangs - - id: file-contents-sorter - files: '(tools\/ci\/executable-list\.txt|tools\/ci\/mypy_ignore_list\.txt)' - id: mixed-line-ending args: ['-f=lf'] - id: double-quote-string-fixer @@ -97,3 +95,8 @@ repos: additional_dependencies: ['mypy==0.800', 'mypy-extensions==0.4.3'] language: python types: [python] + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.4.0 + hooks: + - id: file-contents-sorter + files: '(tools\/ci\/executable-list\.txt|tools\/ci\/mypy_ignore_list\.txt)' diff --git a/tools/ci/idf_ci_utils.py b/tools/ci/idf_ci_utils.py index bcb12ea491ac..d57e88b62474 100644 --- a/tools/ci/idf_ci_utils.py +++ b/tools/ci/idf_ci_utils.py @@ -56,8 +56,8 @@ def _check_git_filemode(full_path): # type: (str) -> bool mode = stdout.split(' ', 1)[0] # e.g. 100644 for a rw-r--r-- if any([int(i, 8) & 1 for i in mode[-3:]]): - return False - return True + return True + return False def is_executable(full_path): # type: (str) -> bool @@ -90,7 +90,7 @@ def get_git_files(path=IDF_PATH, full_path=False): # type: (str, bool) -> list[ # https://github.com/python/cpython/pull/6299/commits/bfd63120c18bd055defb338c075550f975e3bec1 # In order to solve python https://bugs.python.org/issue9584 # glob pattern does not support brace expansion issue -def _translate(pat): +def _translate(pat): # type: (str) -> str """Translate a shell PATTERN to a regular expression. There is no way to quote meta-characters. """ @@ -179,7 +179,7 @@ def _translate(pat): return res -def translate(pat): +def translate(pat): # type: (str) -> str res = _translate(pat) return r'(?s:%s)\Z' % res diff --git a/tools/ci/mypy_ignore_list.txt b/tools/ci/mypy_ignore_list.txt index 422bc8aa1e58..2d8f0cbe626c 100644 --- a/tools/ci/mypy_ignore_list.txt +++ b/tools/ci/mypy_ignore_list.txt @@ -171,7 +171,6 @@ tools/ci/checkout_project_ref.py tools/ci/ci_fetch_submodule.py tools/ci/deploy_docs.py tools/ci/envsubst.py -tools/ci/idf_ci_utils.py tools/ci/normalize_clangtidy_path.py tools/ci/python_packages/gitlab_api.py tools/ci/python_packages/idf_http_server_test/adder.py