From ae0bc35810cbf6f332ef188f7d3267cc8b69b289 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 28 Sep 2015 13:55:22 -0700 Subject: [PATCH] Revert "Drop oslosphinx requirement" This reverts commit 562d075a46121df2e473f8f085fb77a225d2f464. Change-Id: Ibcbfb1da52a177fc213bc9e105e73be34b2a2429 --- .gitignore | 1 - doc/source/conf.py | 1 + test-requirements.txt | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d25d4ef..0246638 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ AUTHORS ChangeLog cover/ -doc/build/ diff --git a/doc/source/conf.py b/doc/source/conf.py index be17430..25fda3e 100755 --- 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 diff --git a/test-requirements.txt b/test-requirements.txt index 39431b3..8592bde 100644 --- 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