From: Eric Ball <eball@linuxfoundation.org>
Date: Wed, 17 Feb 2021 00:40:46 +0000 (-0800)
Subject: Add workaround for pre-commit 2.10.0
X-Git-Tag: v0.61.0~1^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=4d088120467;p=releng%2Fglobal-jjb.git

Add workaround for pre-commit 2.10.0

The jumanjihouse shellcheck hook errors without
additional_dependencies being defined. While there is a PR open to
add this fix, it has not yet been merged and released. Until it is,
this workaround will enable using the latest versions of pre-commit
and the jumanjihouse hooks.
Github PR: https://github.com/jumanjihouse/pre-commit-hooks/pull/80

Change-Id: I0ec16952009128e25cccb6833698bf1bd864af2d
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3b8d1f13..0b2f4a4c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,9 +16,10 @@ repos:
       - id: gitlint
 
   - repo: https://github.com/jumanjihouse/pre-commit-hooks
-    rev: 2.1.1
+    rev: 2.1.4
     hooks:
       - id: shellcheck
+        additional_dependencies: []
 
   - repo: https://github.com/btford/write-good
     rev: v1.0.4
diff --git a/tox.ini b/tox.ini
index 3dfd4411..b9d28d05 100644
--- a/tox.ini
+++ b/tox.ini
@@ -52,7 +52,7 @@ commands = lftools license check-dir -r '.+' shell
 [testenv:pre-commit]
 basepython = python3
 deps =
-    pre-commit==2.9.3
+    pre-commit
 commands =
     pre-commit run --all-files --show-diff-on-failure
     pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_EDITMSG