From 60a85f691c2821f43c55b1fbb0b67e3f926a287f Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Wed, 3 Apr 2019 23:49:43 -0400 Subject: [PATCH] docs: drop sphinxmark sphinxmark is no longer compatible with the latest release of Sphinx which is causing all of our documentation jobs to fail. This patch removes it as our current usage of openstacktheme for documentation already provides watermarks for current branch and notices for which branch the documentation covers. Change-Id: I8db91976d1077ef1cc52485179900a4271940bcf --- doc/requirements.txt | 1 - doc/source/conf.py | 16 ---------------- 2 files changed, 17 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index b3abbc3a..71c0d0d0 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -6,5 +6,4 @@ sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0 -sphinxmark>=0.1.14 # Apache-2.0 doc8>=0.6.0 # Apache-2.0 diff --git a/doc/source/conf.py b/doc/source/conf.py index 071ddd89..edda6b2e 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -23,7 +23,6 @@ # serve to show the default. import pbr.version -import os # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -41,7 +40,6 @@ import os extensions = [ 'openstackdocstheme', 'sphinx.ext.autodoc', - 'sphinxmark' ] # Add any paths that contain templates here, relative to this directory. @@ -312,17 +310,3 @@ texinfo_documents = [ # If true, do not generate a @detailmenu in the "Top" node's menu. # texinfo_no_detailmenu = False - - -watermark = os.popen("git branch --contains $(git rev-parse HEAD)\ -| awk -F/ '/stable/ {print $2}'").read().strip(' \n\t').capitalize() -if watermark == "": - watermark = "Pre-release" - -# -- 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