Revert "Drop oslosphinx requirement"

This reverts commit 562d075a46.

Change-Id: Ibcbfb1da52a177fc213bc9e105e73be34b2a2429
This commit is contained in:
James E. Blair 2015-09-28 13:55:22 -07:00
parent 562d075a46
commit ae0bc35810
3 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -7,4 +7,3 @@
AUTHORS
ChangeLog
cover/
doc/build/

View File

@ -23,6 +23,7 @@ sys.path.insert(0, os.path.abspath('../..'))
extensions = [
'sphinx.ext.autodoc',
#'sphinx.ext.intersphinx',
'oslosphinx'
]
# autodoc generation is a bit aggressive and a nuisance when doing heavy

View File

@ -8,6 +8,7 @@ coverage>=3.6
discover
python-subunit>=0.0.18
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
oslosphinx>=2.2.0 # Apache-2.0
oslotest>=1.2.0 # Apache-2.0
testrepository>=0.0.18
testscenarios>=0.4