Upgrade precommit and tox configurations

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4292186188dab946c3c79e07f625f5618f930cfd

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 264697c2226cd9880af128949774f452fe5cb21a..64222043c95e94ef22051469392313c92b97a9d2 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,18 +1,20 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
 
   - repo: https://github.com/jorisroovers/gitlint
-    rev: v0.15.1
+    rev: v0.19.0dev
     hooks:
       - id: gitlint
         stages: [commit-msg]
+      - id: gitlint-ci
+        stages: [manual]
 
   - repo: https://github.com/Lucas-C/pre-commit-hooks
-    rev: v1.1.10
+    rev: v1.4.1
     hooks:
       - id: remove-tabs
         stages: [commit]

diff --git a/tox.ini b/tox.ini
index ad85799d31868e63e2301b675bfa31d2961f0419..46f1b4832442182e40bebff3b7b231905ca7fde0 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = pre-commit,gitlint,docs,docs-linkcheck,spelling
+envlist = pre-commit,docs,docs-linkcheck,spelling
 skipsdist = true
 
 [testenv:docs]
@@ -28,18 +28,19 @@ commands =
     pre-commit uninstall
     pre-commit uninstall --hook-type commit-msg
 
+[testenv:pre-commit-autoupdate]
+basepython = python3
+deps = pre-commit
+commands =
+    pre-commit autoupdate
+
 [testenv:pre-commit]
 basepython = python3
 deps = pre-commit
 passenv = HOME
 commands =
     pre-commit run --all-files --show-diff-on-failure
-    pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_EDITMSG
-    # Gitlint only proposes a pre-commit configuration for the commit-msg stage but none for the commit stage.
-    # Its default arguments --passed and --msg-filename are different from CI recommandations.
-    # As a result, the line above is skipped in jenkins CI since there cannot be a .git/COMMIT_EDITMSG file
-    # and the HOME variable must be passed to tox virtualenv so that Gitlint can access the git user configuration.
-    # A dedicated gitlint profile for CI is proposed below.
+    pre-commit run gitlint-ci --hook-stage manual
 
 [testenv:gitlint]
 basepython = python3