From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 18 Aug 2018 06:09:53 +0000 (+0200)
Subject: Publish Functest doc online
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c8dffa3b40d7893361d1ac303b340d3b9b1b76a6;p=functest.git

Publish Functest doc online

It reverts Sphinx theme to the default one as it's hugely better for
API docs.

Change-Id: Ic489e9b65d67d71fadb8ef78176a04cc382a3f5d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 20ee61db8d38bf12127afd12e34ac601d36b3ff5)
---

diff --git a/docs/release/release-notes/conf.py b/docs/release/release-notes/conf.py
index b9a996a7e..a2421cad3 100644
--- a/docs/release/release-notes/conf.py
+++ b/docs/release/release-notes/conf.py
@@ -19,8 +19,6 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
-import sphinx_opnfv_theme
-
 
 # -- General configuration ------------------------------------------------
 
@@ -83,22 +81,16 @@ todo_include_todos = False
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'opnfv'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 #
 # html_theme_options = {}
-html_theme_options = {
-    'bootswatch_theme': 'journal',
-    'navbar_sidebarrel': False,
-    'navbar_title': '',
-}
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []
-html_theme_path = sphinx_opnfv_theme.get_html_theme_path()
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/docs/testing/developer/devguide/conf.py b/docs/testing/developer/devguide/conf.py
index 28255a69e..017dda070 100644
--- a/docs/testing/developer/devguide/conf.py
+++ b/docs/testing/developer/devguide/conf.py
@@ -19,8 +19,6 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
-import sphinx_opnfv_theme
-
 
 # -- General configuration ------------------------------------------------
 
@@ -83,22 +81,16 @@ todo_include_todos = False
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'opnfv'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 #
 # html_theme_options = {}
-html_theme_options = {
-    'bootswatch_theme': 'journal',
-    'navbar_sidebarrel': False,
-    'navbar_title': '',
-}
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []
-html_theme_path = sphinx_opnfv_theme.get_html_theme_path()
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/docs/testing/developer/internship/security_group/conf.py b/docs/testing/developer/internship/security_group/conf.py
index 46080c6d6..7b146baec 100644
--- a/docs/testing/developer/internship/security_group/conf.py
+++ b/docs/testing/developer/internship/security_group/conf.py
@@ -19,8 +19,6 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
-import sphinx_opnfv_theme
-
 
 # -- General configuration ------------------------------------------------
 
@@ -83,22 +81,16 @@ todo_include_todos = False
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'opnfv'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 #
 # html_theme_options = {}
-html_theme_options = {
-    'bootswatch_theme': 'journal',
-    'navbar_sidebarrel': False,
-    'navbar_title': '',
-}
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []
-html_theme_path = sphinx_opnfv_theme.get_html_theme_path()
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/docs/testing/developer/internship/testapi_evolution/conf.py b/docs/testing/developer/internship/testapi_evolution/conf.py
index f59308c59..8e039fedf 100644
--- a/docs/testing/developer/internship/testapi_evolution/conf.py
+++ b/docs/testing/developer/internship/testapi_evolution/conf.py
@@ -19,8 +19,6 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
-import sphinx_opnfv_theme
-
 
 # -- General configuration ------------------------------------------------
 
@@ -83,22 +81,16 @@ todo_include_todos = False
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'opnfv'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 #
 # html_theme_options = {}
-html_theme_options = {
-    'bootswatch_theme': 'journal',
-    'navbar_sidebarrel': False,
-    'navbar_title': '',
-}
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []
-html_theme_path = sphinx_opnfv_theme.get_html_theme_path()
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/docs/testing/developer/internship/unit_tests/conf.py b/docs/testing/developer/internship/unit_tests/conf.py
index 00dec3c82..4d72fca39 100644
--- a/docs/testing/developer/internship/unit_tests/conf.py
+++ b/docs/testing/developer/internship/unit_tests/conf.py
@@ -19,8 +19,6 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
-import sphinx_opnfv_theme
-
 
 # -- General configuration ------------------------------------------------
 
@@ -83,22 +81,16 @@ todo_include_todos = False
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'opnfv'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 #
 # html_theme_options = {}
-html_theme_options = {
-    'bootswatch_theme': 'journal',
-    'navbar_sidebarrel': False,
-    'navbar_title': '',
-}
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []
-html_theme_path = sphinx_opnfv_theme.get_html_theme_path()
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/docs/testing/developer/internship/vnf_catalog/conf.py b/docs/testing/developer/internship/vnf_catalog/conf.py
index de8336225..fe3cdb722 100644
--- a/docs/testing/developer/internship/vnf_catalog/conf.py
+++ b/docs/testing/developer/internship/vnf_catalog/conf.py
@@ -19,8 +19,6 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
-import sphinx_opnfv_theme
-
 
 # -- General configuration ------------------------------------------------
 
@@ -83,22 +81,16 @@ todo_include_todos = False
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'opnfv'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 #
 # html_theme_options = {}
-html_theme_options = {
-    'bootswatch_theme': 'journal',
-    'navbar_sidebarrel': False,
-    'navbar_title': '',
-}
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []
-html_theme_path = sphinx_opnfv_theme.get_html_theme_path()
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/docs/testing/user/configguide/conf.py b/docs/testing/user/configguide/conf.py
index c0dc12599..738b6414b 100644
--- a/docs/testing/user/configguide/conf.py
+++ b/docs/testing/user/configguide/conf.py
@@ -19,8 +19,6 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
-import sphinx_opnfv_theme
-
 
 # -- General configuration ------------------------------------------------
 
@@ -83,22 +81,16 @@ todo_include_todos = False
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'opnfv'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 #
 # html_theme_options = {}
-html_theme_options = {
-    'bootswatch_theme': 'journal',
-    'navbar_sidebarrel': False,
-    'navbar_title': '',
-}
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []
-html_theme_path = sphinx_opnfv_theme.get_html_theme_path()
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/docs/testing/user/userguide/conf.py b/docs/testing/user/userguide/conf.py
index 716d3b3d2..7b16ecf82 100644
--- a/docs/testing/user/userguide/conf.py
+++ b/docs/testing/user/userguide/conf.py
@@ -19,8 +19,6 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
-import sphinx_opnfv_theme
-
 
 # -- General configuration ------------------------------------------------
 
@@ -83,22 +81,16 @@ todo_include_todos = False
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'opnfv'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 #
 # html_theme_options = {}
-html_theme_options = {
-    'bootswatch_theme': 'journal',
-    'navbar_sidebarrel': False,
-    'navbar_title': '',
-}
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []
-html_theme_path = sphinx_opnfv_theme.get_html_theme_path()
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/test-requirements.txt b/test-requirements.txt
index 729ea47d6..8a7aded0b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,6 @@ nose # LGPL
 flake8<2.6.0,>=2.5.4 # MIT
 pylint==1.4.5 # GPLv2
 sphinx>=1.6.2 # BSD
-sphinx-opnfv-theme
 sphinx-rtd-theme
 yamllint
 doc8 # Apache-2.0
diff --git a/upper-constraints.txt b/upper-constraints.txt
index 2de6a6329..696ea2959 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -21,4 +21,3 @@ ansible===2.3.2.0
 flasgger===0.6.6
 xtesting===0.35.0
 networking-bgpvpn===7.0.0
-sphinx-opnfv-theme===0.1.1