From 9dceacc5f13581d2d250141fe2b3c1e7baf0c4ed Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 21 Jul 2017 21:39:53 +0200 Subject: [PATCH] [install-guide] The guide is version independent Remove watermark for pike. This allows to remove sphinxmark extension usage, so remove it and pillow from test-requirements and update contributor-guide for this. Explain that guide handles Pike release now. Change-Id: Ib1c71971b822cc0aa3e6531b2d5607714551d9db --- doc/contributor-guide/source/docs-builds.rst | 11 ----------- doc/install-guide/source/conf.py | 8 +------- doc/install-guide/source/preface.rst | 2 +- test-requirements.txt | 2 -- 4 files changed, 2 insertions(+), 21 deletions(-) diff --git a/doc/contributor-guide/source/docs-builds.rst b/doc/contributor-guide/source/docs-builds.rst index bb31eed8dd..02f8dcbf7e 100644 --- a/doc/contributor-guide/source/docs-builds.rst +++ b/doc/contributor-guide/source/docs-builds.rst @@ -162,17 +162,6 @@ If you do not want to use Tox, install the below prerequisites locally: # pip install sphinx # pip install openstackdocstheme - # pip install sphinxmark - -.. note:: - - Sphinxmark uses the `Pillow module - `_ for creating PNG files. - If you encounter ``C module is not installed`` errors when Sphinx loads the - sphinxmark extension, you may need to install some of the - `external libraries - `_ - for Pillow. To get the ``.html`` output locally, switch to the directory containing a ``conf.py`` and run: diff --git a/doc/install-guide/source/conf.py b/doc/install-guide/source/conf.py index 33efbf8881..9305d3ac92 100644 --- a/doc/install-guide/source/conf.py +++ b/doc/install-guide/source/conf.py @@ -38,7 +38,7 @@ import openstackdocstheme # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. -extensions = ['sphinxmark', 'openstackdocstheme'] +extensions = ['openstackdocstheme'] # Add any paths that contain templates here, relative to this directory. # templates_path = ['_templates'] @@ -306,9 +306,3 @@ pdf_documents = [ ('index', u'InstallGuide', u'Install Guide', u'OpenStack contributors') ] - -# -- Options for sphinxmark ----------------------------------------------- -sphinxmark_enable = True -sphinxmark_div = 'docs-body' -sphinxmark_image = 'text' -sphinxmark_text = 'Pike' diff --git a/doc/install-guide/source/preface.rst b/doc/install-guide/source/preface.rst index bf4d765953..b5d537d3a0 100644 --- a/doc/install-guide/source/preface.rst +++ b/doc/install-guide/source/preface.rst @@ -23,7 +23,7 @@ are included. Please see the `OpenStack Training Labs `_. -This guide documents the OpenStack Ocata release. +This guide documents the OpenStack Pike release. .. warning:: diff --git a/test-requirements.txt b/test-requirements.txt index af01f48273..d206f8fcce 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -15,7 +15,6 @@ doc8 # Apache-2.0 requests>=2.14.2 # Apache-2.0 requestsexceptions>=1.2.0 # Apache-2.0 reno>=1.8.0,!=2.3.1 # Apache-2.0 -sphinxmark>=0.1.19 # Apache-2.0 lxml>=2.3,!=3.7.0 # BSD PyYAML>=3.10.0 # MIT jsonschema>=2.6.0 @@ -24,4 +23,3 @@ jsonschema>=2.6.0 # Babel 2.4.0 is broken, fixed in 2.4.1 Babel>=2.3.4,!=2.4.0 # BSD -Pillow>=2.4.0 # PIL License