Merge "Add workaround for pre-commit 2.10.0"

[releng/global-jjb.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 29ba236..b9d28d0 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 minversion = 1.6
 envlist =
-  coala,
   ensure-documented,
   jjb,
   jjb-compare-xml,
@@ -9,27 +8,7 @@ envlist =
   jjb-version,
   license,
   pre-commit
-skipsdist = true
-passenv = TOX_WORK_DIR
-toxworkdir = {env:TOX_WORK_DIR:/tmp/v}
-
-[testenv:coala]
-basepython = python3
-deps =
-    coala
-    coala-bears
-    pygments~=2.3.1
-    # request-2.22.0 does not work with python-3.4.9
-    requests~=2.21.0
-    # Markdown lint requires nodejs
-    nodeenv
-    # numpy-1.17.0 requires python 3.5
-    numpy~=1.16.4
-commands =
-    nodeenv -p
-    npm install --global remark-cli remark-lint write-good
-    python3 -m nltk.downloader punkt maxent_treebank_pos_tagger averaged_perceptron_tagger
-    coala --non-interactive
+skipsdist = True
 
 [testenv:docs]
 basepython = python3
@@ -75,7 +54,8 @@ basepython = python3
 deps =
     pre-commit
 commands =
-    pre-commit run --all-files
+    pre-commit run --all-files --show-diff-on-failure
+    pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_EDITMSG
 
 #########
 # Tools #