From 21ead443814d0270a212d9be8f7cf01dc7b27c7a Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Wed, 3 Apr 2019 11:50:02 -0400 Subject: [PATCH] gate: drop sphinxmark 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 --- deploy-guide/source/conf.py | 11 +---------- doc/requirements.txt | 1 - doc/source/conf.py | 10 +--------- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py index 513b39a17d..10d73ce6f3 100644 --- a/deploy-guide/source/conf.py +++ b/deploy-guide/source/conf.py @@ -96,7 +96,6 @@ extensions = [ 'openstackdocstheme', 'sphinx.ext.autodoc', - 'sphinxmark', 'sphinx.ext.extlinks' ] @@ -325,12 +324,4 @@ 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 +] \ No newline at end of file diff --git a/doc/requirements.txt b/doc/requirements.txt index 5a7d3520ab..f9ca1f3b3d 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -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 diff --git a/doc/source/conf.py b/doc/source/conf.py index 376d95d22c..bc83f98eb2 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -110,8 +110,7 @@ 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 @@ 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/']