Merge "Update cloud image list docs"

[releng/builder.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 285f266275177f5b086239b0d129d51cb81ba7ed..9277b269b97f4acf535415d1cc08b1db19baafb7 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,38 +1,28 @@
 [tox]
 minversion = 1.6
-envlist = coala,docs,jjb-version,pep8,prefix,robot
+envlist = docs,jjb-version,pre-commit,prefix,robot
 skipsdist = true
 
-[testenv:coala]
-basepython = python3
-deps =
-    coala==0.11
-    coala-bears==0.11
-    # Requests 2.16 breaks dependencies
-    requests<2.16
-    nodeenv==1.1.2
-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]
 deps = -rdocs/requirements.txt
 commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
 
 [testenv:jenkins-jobs]
 deps =
-    jenkins-job-builder=={env:JJB_VERSION:2.9.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