Revert "Drop oslosphinx requirement"

This reverts commit 562d075a46121df2e473f8f085fb77a225d2f464. Change-Id: Ibcbfb1da52a177fc213bc9e105e73be34b2a2429
2015-09-28 13:55:22 -07:00 · 2015-09-28 13:55:22 -07:00 · ae0bc35810
commit ae0bc35810
parent 562d075a46
3 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,4 +7,3 @@
 AUTHORS
 ChangeLog
 cover/
-doc/build/
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@ -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
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -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