Revert "Remove Sphinx from py33 requirements"

This reverts commit f3927e17f7.

Change-Id: I424315afe5cdfe42f4eeb22cb3e760d6013eaf46
This commit is contained in:
gordon chung 2014-12-30 15:04:19 +00:00
parent f3927e17f7
commit 82c0b8f097

View File

@ -11,15 +11,15 @@ fixtures>=0.3.14
httplib2>=0.7.5
mock>=1.0
mox>=0.5.3
# Docs Requirements are commented out because of the quick fix of bug #1403510
# oslosphinx>=2.2.0 # Apache-2.0
# Docs Requirements
oslosphinx>=2.2.0 # Apache-2.0
oslotest>=1.2.0 # Apache-2.0
pymongo>=2.5
python-subunit>=0.0.18
# sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
# sphinxcontrib-docbookrestapi
# sphinxcontrib-httpdomain
# sphinxcontrib-pecanwsme>=0.8
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
sphinxcontrib-docbookrestapi
sphinxcontrib-httpdomain
sphinxcontrib-pecanwsme>=0.8
testrepository>=0.0.18
testscenarios>=0.4
testtools>=0.9.36,!=1.2.0