From cc17aeff4be5e1404a87f3724148280df9117e8a Mon Sep 17 00:00:00 2001 From: Terri Oda Date: Tue, 9 Jan 2024 13:14:46 -0800 Subject: [PATCH 1/2] ci: improve interrogate/pre-commit config Signed-off-by: Terri Oda --- .github/workflows/linting.yml | 7 ++----- .pre-commit-config.yaml | 7 ++++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index fb62de91e3..476f2cb996 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -12,12 +12,10 @@ jobs: linting: name: Linting runs-on: ubuntu-22.04 - permissions: - contents: write # for stefanzweifel/git-auto-commit-action to create a PR strategy: fail-fast: false matrix: - tool: ['isort', 'black', 'pyupgrade', 'flake8', 'bandit', 'gitlint', 'mypy','interrogate'] + tool: ['isort', 'black', 'pyupgrade', 'flake8', 'bandit', 'gitlint', 'mypy', 'interrogate'] steps: - name: Harden Runner uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1 @@ -46,5 +44,4 @@ jobs: run: | python -m pip install --upgrade gitlint echo "$TITLE" | gitlint - - uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d - + diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cde668c526..7d88d23760 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -76,6 +76,7 @@ repos: hooks: - id: interrogate verbose: True - exclude: ^(locales|presentation) - args: ["-vv", "-i", "-I", "-M", "-C", "-n", "-p", "-f", "60.0", "-e", "fuzz/", "-e", "test/", "-e", "cve_bin_tool/checkers/", "-e", "build/"] - pass_filenames: false \ No newline at end of file + exclude: ^(locales|presentation|fuzz|test|cve_bin_tool/checkers|build) + args: ["-vv", "-i", "-I", "-M", "-C", "-n", "-p", "-f", "60.0"] + pass_filenames: false + From b59fe28fbd03b2b338966c1dd9a7a402103891d7 Mon Sep 17 00:00:00 2001 From: Terri Oda Date: Tue, 9 Jan 2024 13:48:22 -0800 Subject: [PATCH 2/2] fix: forgot to remove pass_filenames --- .pre-commit-config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7d88d23760..3c96b952ae 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -78,5 +78,4 @@ repos: verbose: True exclude: ^(locales|presentation|fuzz|test|cve_bin_tool/checkers|build) args: ["-vv", "-i", "-I", "-M", "-C", "-n", "-p", "-f", "60.0"] - pass_filenames: false