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

Morgan Fainberg · portante · commit 9a2bd7907390 · 2013-12-10T17:31:21.000-05:00
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
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -8,5 +8,5 @@ nose
 nosexcover
 openstack.nose_plugin
 nosehtmloutput
-sphinx>=1.1.2
+sphinx>=1.1.2,<1.2
 mock>=0.8.0
diff --git a/tox.ini b/tox.ini
@@ -2,6 +2,7 @@
 envlist = py26,py27,pep8
 
 [testenv]
+install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          NOSE_WITH_OPENSTACK=1
          NOSE_OPENSTACK_COLOR=1
