openstack/openstack-ansible
Code Issues Proposed changes

gate: drop sphinxmark

Browse Source 
sphinxmark is currently broken due to Sphinx 2.0.0 release, this
patch drops all of the code which uses it for now until we land
an upstream fix that unbreaks us.

Change-Id: Iba0bc579b6a82046ca0a0d7177d2ba9fd95ac3a4
This commit is contained in:
Mohammed Naser 2019-04-03 11:50:02 -04:00
parent 33c4f9df3d
commit 21ead44381
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deploy-guide/source/conf.py
View File

@ -96,7 +96,6 @@ sys.path.insert(0, os.path.abspath('../../inventory/'))
extensions = [
'openstackdocstheme',
'sphinx.ext.autodoc',
'sphinxmark',
'sphinx.ext.extlinks'
]
@ -325,12 +324,4 @@ texinfo_documents = [
pdf_documents = [
(master_doc, target_name,
title, author)
]
# -- Options for sphinxmark -----------------------------------------------
sphinxmark_enable = True
sphinxmark_div = 'docs-body'
sphinxmark_image = 'text'
sphinxmark_text = watermark
sphinxmark_text_color = (128, 128, 128)
sphinxmark_text_size = 70
]

1
doc/requirements.txt
View File

@ -6,6 +6,5 @@
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
openstackdocstheme>=1.29.2 # Apache-2.0
reno>=2.5.0 # Apache-2.0
sphinxmark>=0.1.14 # Apache-2.0
doc8>=0.6.0 # Apache-2.0
bashate>=0.5.1 # Apache-2.0

10
doc/source/conf.py
View File

@ -110,8 +110,7 @@ sys.path.insert(0, os.path.abspath('../../inventory/'))
extensions = [
'openstackdocstheme',
'sphinx.ext.autodoc',
'sphinx.ext.extlinks',
'sphinxmark'
'sphinx.ext.extlinks'
]
# Add any paths that contain templates here, relative to this directory.
@ -348,11 +347,4 @@ pdf_documents = [
title, author)
]
# -- Options for sphinxmark -----------------------------------------------
sphinxmark_enable = True
sphinxmark_div = 'docs-body'
sphinxmark_image = 'text'
sphinxmark_text = watermark
sphinxmark_text_color = (128, 128, 128)
sphinxmark_text_size = 70
locale_dirs = ['locale/']