Merge "Configure OpenJDK11 for jsonrpc-sonar job"

[releng/builder.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 3fd449bfab4441f66dd4441b7fc5b4e846081422..bf47e3e0e3f52880c82deef646e48781f9de6af3 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = coala,docs,pep8,prefix,robot
+envlist = coala,docs,jjb-version,pre-commit,prefix,robot
 skipsdist = true
 
 [testenv:coala]
@@ -8,13 +8,10 @@ basepython = python3
 deps =
     coala==0.11
     coala-bears==0.11
-    # Requests 2.16 breaks dependencies
-    requests<2.16
-    nodeenv==1.1.2
+    nodeenv
 commands =
     nodeenv -p
     npm install --global write-good
-    python3 -m nltk.downloader punkt maxent_treebank_pos_tagger averaged_perceptron_tagger
     coala --non-interactive
 
 [testenv:docs]
@@ -23,16 +20,20 @@ commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs
 
 [testenv:jenkins-jobs]
 deps =
-    jenkins-job-builder=={env:JJB_VERSION:2.2.1}
+    jenkins-job-builder=={env:JJB_VERSION:3.5.0}
 commands =
     jenkins-jobs {posargs:--help}
 
 [testenv:jjb-version]
 commands = python {toxinidir}/check_jjb_version.py
 
-[testenv:pep8]
-deps = flake8
-commands = flake8 scripts/ *.py
+[testenv:pre-commit]
+basepython = python3
+deps = pre-commit
+commands =
+    pre-commit install --hook-type commit-msg
+    pre-commit run --all-files --show-diff-on-failure
+    pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_EDITMSG
 
 [testenv:prefix]
 commands = python {toxinidir}/check_prefix.py