summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2019-06-11 11:38:10 -0700
committerColleen Murphy <colleen@gazlene.net>2019-06-11 11:54:08 -0700
commitf828bb872129b5082d07efdaf3da0c3722640013 (patch)
treef5bdadae761e186959058466841abb46a90b4a91 /doc
parent05ea48be2d0fc053cc16352a8e976be91dcf8f7a (diff)
downloadkeystone-f828bb872129b5082d07efdaf3da0c3722640013.tar.gz
Revert "Ignore boilerplate constants in autodoc"
This reverts commit 698c20577e736496f1219832494f77000f90c2ad. With the release of Sphinx 2.1.1[1] constants are no longer autodoc'd so we don't have this problem any more. [1] https://github.com/sphinx-doc/sphinx/issues/6447 Change-Id: Id9164a0311a59a78cb2b9018c95809d0fccc54f7
Diffstat (limited to 'doc')
-rw-r--r--doc/source/conf.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index c9ff73e3f..d0196cdd1 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -53,9 +53,6 @@ apidoc_excluded_paths = [
'test']
apidoc_separate_modules = True
-# NOTE(cmurphy) exclude these module constants from being autodoc'd, because
-# they pull in the documentation from external modules
-# https://github.com/sphinx-doc/sphinx/issues/6447
autodoc_default_options = {
'exclude-members': 'Column,Index,String,Integer,Enum,ForeignKey,DateTime,'
'Date,TIMESTAMP,IntegrityError,OperationalError,'
@@ -63,8 +60,7 @@ autodoc_default_options = {
'PrimaryKeyConstraint,joinedload,Unicode,'
'RequestValidator,Client,AccessTokenEndpoint,'
'ResourceEndpoint,AuthorizationEndpoint,SIG_HMAC,'
- 'RequestTokenEndpoint,oRequest,'
- 'CONF,LOG'
+ 'RequestTokenEndpoint,oRequest'
}
# sphinxcontrib.seqdiag options