summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2016-07-13 13:39:47 +0200
committerAndreas Jaeger <aj@suse.com>2016-08-09 13:07:09 +0200
commit190081c865a740af9929e4f5b104fcb2c007c9d2 (patch)
treedb3e99eae7827aaeb1cc8161ec7f6544c1ba911e /tox.ini
parentad4a6e9502a867c2885b5b34d56d73b650e27a5c (diff)
downloadnova-190081c865a740af9929e4f5b104fcb2c007c9d2.tar.gz
Move JSON linting to pep8
The docs job is not run in the gate, add the linting command from the docs environment that checks for valid JSON files to the pep8 environement so that jobs run it. Add a simple comment to both invocations to explain what it does. Note that pep8 is our general linting target and thus should include these kind of tests. Change-Id: Ibb2ad29ca59b86fef41ebfe0ec3b8e8ea38e6d72
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini3
1 files changed, 3 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 4a353e12ce..f5c1b5ea06 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,6 +27,8 @@ basepython = python2.7
deps = hacking
commands =
bash tools/flake8wrap.sh {posargs}
+ # Check that all included JSON files are valid JSON
+ bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python'
[testenv:py34]
# NOTE(mriedem): If py34 fails with "db type could not be determined", delete
@@ -94,6 +96,7 @@ commands = {posargs}
commands =
rm -rf doc/source/api doc/build api-guide/build api-ref/build
python setup.py build_sphinx
+ # Check that all included JSON files are valid JSON
bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python'
oslo-config-generator --config-file=etc/nova/nova-config-generator.conf
oslopolicy-sample-generator --config-file=etc/nova/nova-policy-generator.conf