Merge "fix 'tox -e docs' by limiting sphinx versions"

test-requirements.txt

@@ -9,7 +9,7 @@ testtools
 fixtures
 
 # For doc building
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx>=1.2.0,<1.3
 oslosphinx
 
 # For style checking

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