openstack/placement
Code Issues Proposed changes

Merge "Undo tox -e docs pip install sphinx workaround"

Browse Source
This commit is contained in:
Jenkins 2015-07-31 16:06:40 +00:00 committed by Gerrit Code Review
commit 1924f12147
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tox.ini
View File

@ -150,15 +150,10 @@ commands =
coverage html --include='nova/*' --omit='nova/openstack/common/*' -d covhtml -i coverage html --include='nova/*' --omit='nova/openstack/common/*' -d covhtml -i
[testenv:venv] [testenv:venv]
commands = commands = {posargs}
# TODO(sdague) this is a brute force work around for pip not respecting test-requirements.txt
pip install "sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2"
{posargs}
[testenv:docs] [testenv:docs]
commands = commands =
# TODO(sdague) this is a brute force work around for pip not respecting test-requirements.txt
pip install "sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2"
python setup.py build_sphinx python setup.py build_sphinx
bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python' bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python'