Pin cryptography to 3.3.2

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

diff --git a/tox.ini b/tox.ini
index 54b2761..0da5583 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,28 +8,10 @@ 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
-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
 deps = -rrequirements.txt
 commands =
     sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
@@ -40,24 +21,28 @@ commands =
     ./ensure-documented.sh
 
 [testenv:jjb]
+basepython = python3
 deps =
     jenkins-job-builder==2.8.0
 commands =
     jenkins-jobs -l DEBUG test --recursive -o {toxinidir}/archives/job-configs {toxinidir}/jjb:{toxinidir}/.jjb-test
 
 [testenv:jjb-compare-xml]
+basepython = python3
 deps =
     jenkins-job-builder
 commands =
     ./jjb-compare-xml.sh
 
 [testenv:jjb-latest]
+basepython = python3
 deps =
     jenkins-job-builder
 commands =
     jenkins-jobs -l DEBUG test --recursive -o {toxinidir}/archives/job-configs {toxinidir}/jjb:{toxinidir}/.jjb-test
 
 [testenv:jjb-version]
+basepython = python3
 commands = python {toxinidir}/check_jjb_version.py
 
 [testenv:license]
@@ -65,9 +50,12 @@ deps = lftools
 commands = lftools license check-dir -r '.+' shell
 
 [testenv:pre-commit]
-deps = pre-commit
+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 #
@@ -88,5 +76,5 @@ deps = python-openstackclient{env:OPENSTACK_VERSION_OP:~=}{env:OPENSTACK_VERSION
 commands = openstack {posargs:--help}
 
 [testenv:reno]
-deps = reno{env:RENO_VERSION_OP:~=}{env:RENO_VERSION:2.10.0}
+deps = reno{env:RENO_VERSION_OP:~=}{env:RENO_VERSION:2.11.2}
 commands = reno {posargs:--help}