From 1d5b6964d2807c2b7689a5f99a9bd64a311ef068 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Wed, 15 Jul 2015 06:41:21 -0700 Subject: [PATCH] Undo tox -e docs pip install sphinx workaround Now that we require at least pbr 1.3 and that has commit 61a3a1ecdf99c680e509742fdc6c441b499af130 in it, let's remove the workaround. Change-Id: I4074b05a823d32f5db0051062527b0db4d379b62 Related-Bug: #1473401 --- tox.ini | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tox.ini b/tox.ini index 96d070f76ae6..744c1acde6ac 100644 --- a/tox.ini +++ b/tox.ini @@ -149,15 +149,10 @@ commands = coverage html --include='nova/*' --omit='nova/openstack/common/*' -d covhtml -i [testenv:venv] -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" - {posargs} +commands = {posargs} [testenv:docs] 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 bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python'