Sync global requirements to pin sphinx to sphinx>=1.1.2,<1.2

Sync the global requirements to pin sphinx.  This addresses an issue
where Sphinx 1.2 is not building documents correctly and causing
check/gate to fail.

We also had to adjust the pip command used.

Change-Id: I8894c0199db845e90e5086a7c0e6bb7c7a26b5a0
This commit is contained in:
Morgan Fainberg 2013-12-10 14:06:45 -08:00 committed by Alan Pevec
parent 2e0ebfbff3
commit 2f3526c559
2 changed files with 2 additions and 1 deletions

View File

@ -8,5 +8,5 @@ nose
nosexcover
openstack.nose_plugin
nosehtmloutput
sphinx>=1.1.2
sphinx>=1.1.2,<1.2
mock>=0.8.0

View File

@ -2,6 +2,7 @@
envlist = py26,py27,py33,pep8
[testenv]
install_command = pip install -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
NOSE_WITH_OPENSTACK=1
NOSE_OPENSTACK_COLOR=1