From 9a2bd79073900f7e988c9671f3ce93201abd2dda Mon Sep 17 00:00:00 2001
From: Morgan Fainberg <m@metacloud.com>
Date: Tue, 10 Dec 2013 14:06:45 -0800
Subject: [PATCH] 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
---
 test-requirements.txt | 2 +-
 tox.ini               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index fdebbb6e4e..9ff8d1c685 100644
--- 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
index fac7de6421..218e785664 100644
--- 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