From 3e9bfcfd7abddcb5335b48b0ed04f0646bb85a00 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Thu, 2 Jul 2015 14:05:05 -0400
Subject: [PATCH] fix 'tox -e docs' by limiting sphinx versions

pbr has issues invoking sphinx versions >1.3 (http://pad.lv/1379998)

The fix here is two-fold:
 a.) no longer use 'pip install --pre'
     I'd rather spend less time debugging failures due to new pip packages.
 b.) shorten the list of requirements on sphinx as a result of 'a'
     Since 1.3b* versions were pre, and we're no longer installing with --pre
     we do not need to explicitly blacklist them.

At a future date when pbr is available with a fix, we can remove the upper
limit on sphinx.

Change-Id: I696fc3e4ef8803bbb2a95e34501d5330a64ab93c
---
 test-requirements.txt | 2 +-
 tox.ini               | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 2c2b0846..842d5838 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ nose
 testtools
 
 # For doc building
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx>=1.2.0,<1.3
 oslosphinx
 
 # For style checking
diff --git a/tox.ini b/tox.ini
index 607d83e2..f23044d5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,6 +15,10 @@ deps = -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/requirements.txt
 commands = {envpython} {toxinidir}/tools/noproxy nosetests {posargs}
 
+# tox uses '--pre' by default to pip install.  We don't want that, and
+# 'pip_pre=False' isn't available until tox version 1.9.
+install_command = pip install {opts} {packages}
+
 [testenv:py26]
 deps = {[testenv]deps}
     importlib