update docs for new theme

docs/Makefile

@@ -1,10 +1,10 @@
 # Minimal makefile for Sphinx documentation
 #
 
-# You can set these variables from the command line.
+# You can set these variables from the command line, and also
-SPHINXOPTS    =
+# from the environment for the first two.
-SPHINXBUILD   = sphinx-build
+SPHINXOPTS    ?=
-SPHINXPROJ    = Flask
+SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = .
 BUILDDIR      = _build
 
@@ -17,4 +17,4 @@ help:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/conf.py

@@ -1,163 +1,91 @@
-# -*- coding: utf-8 -*-
+import packaging.version
-from __future__ import print_function
+from pallets_sphinx_themes import get_version
-
+from pallets_sphinx_themes import ProjectLink
-import inspect
-import re
-
-from pallets_sphinx_themes import ProjectLink, get_version
 
 # Project --------------------------------------------------------------
 
-project = 'Flask'
+project = "Flask"
-copyright = '2010 Pallets Team'
+copyright = "2010 Pallets"
-author = 'Pallets Team'
+author = "Pallets"
-release, version = get_version('Flask')
+release, version = get_version("Flask")
 
 # General --------------------------------------------------------------
 
-master_doc = 'index'
+master_doc = "index"
-
 extensions = [
-    'sphinx.ext.autodoc',
+    "sphinx.ext.autodoc",
-    'sphinx.ext.intersphinx',
+    "sphinx.ext.intersphinx",
-    'sphinxcontrib.log_cabinet',
+    "sphinxcontrib.log_cabinet",
+    "pallets_sphinx_themes",
+    "sphinx_issues",
 ]
-
 intersphinx_mapping = {
-    'python': ('https://docs.python.org/3/', None),
+    "python": ("https://docs.python.org/3/", None),
-    'werkzeug': ('http://werkzeug.pocoo.org/docs/', None),
+    "werkzeug": ("https://werkzeug.palletsprojects.com/", None),
-    'click': ('http://click.pocoo.org/', None),
+    "click": ("https://click.palletsprojects.com/", None),
-    'jinja': ('http://jinja.pocoo.org/docs/', None),
+    "jinja": ("http://jinja.pocoo.org/docs/", None),
-    'itsdangerous': ('https://pythonhosted.org/itsdangerous', None),
+    "itsdangerous": ("https://itsdangerous.palletsprojects.com/", None),
-    'sqlalchemy': ('https://docs.sqlalchemy.org/en/latest/', None),
+    "sqlalchemy": ("https://docs.sqlalchemy.org/", None),
-    'wtforms': ('https://wtforms.readthedocs.io/en/latest/', None),
+    "wtforms": ("https://wtforms.readthedocs.io/en/stable/", None),
-    'blinker': ('https://pythonhosted.org/blinker/', None),
+    "blinker": ("https://pythonhosted.org/blinker/", None),
 }
+issues_github_path = "pallets/flask"
 
 # HTML -----------------------------------------------------------------
 
-html_theme = 'flask'
+html_theme = "flask"
+html_theme_options = {"index_sidebar_logo": False}
 html_context = {
-    'project_links': [
+    "project_links": [
-        ProjectLink('Donate to Pallets', 'https://psfmember.org/civicrm/contribute/transact?reset=1&id=20'),
+        ProjectLink("Donate to Pallets", "https://palletsprojects.com/donate"),
-        ProjectLink('Flask Website', 'https://palletsprojects.com/p/flask/'),
+        ProjectLink("Flask Website", "https://palletsprojects.com/p/flask/"),
-        ProjectLink('PyPI releases', 'https://pypi.org/project/Flask/'),
+        ProjectLink("PyPI releases", "https://pypi.org/project/Flask/"),
-        ProjectLink('Source Code', 'https://github.com/pallets/flask/'),
+        ProjectLink("Source Code", "https://github.com/pallets/flask/"),
-        ProjectLink(
+        ProjectLink("Issue Tracker", "https://github.com/pallets/flask/issues/"),
-            'Issue Tracker', 'https://github.com/pallets/flask/issues/'),
-    ],
-    'canonical_url': 'http://flask.pocoo.org/docs/{}/'.format(version),
-    'carbon_ads_args': 'zoneid=1673&serve=C6AILKT&placement=pocooorg',
-}
-html_sidebars = {
-    'index': [
-        'project.html',
-        'versions.html',
-        'carbon_ads.html',
-        'searchbox.html',
-    ],
-    '**': [
-        'localtoc.html',
-        'relations.html',
-        'versions.html',
-        'carbon_ads.html',
-        'searchbox.html',
     ]
 }
-html_static_path = ['_static']
+html_sidebars = {
-html_favicon = '_static/flask-favicon.ico'
+    "index": ["project.html", "localtoc.html", "searchbox.html"],
-html_logo = '_static/flask.png'
+    "**": ["localtoc.html", "relations.html", "searchbox.html"],
-html_additional_pages = {
-    '404': '404.html',
 }
+singlehtml_sidebars = {"index": ["project.html", "localtoc.html"]}
+html_static_path = ["_static"]
+html_favicon = "_static/flask-icon.png"
+html_logo = "_static/flask-icon.png"
+html_title = "Flask Documentation ({})".format(version)
 html_show_sourcelink = False
 
 # LaTeX ----------------------------------------------------------------
 
 latex_documents = [
-    (master_doc, 'Flask.tex', 'Flask Documentation', 'Pallets Team', 'manual'),
+    (master_doc, "Flask-{}.tex".format(version), html_title, author, "manual")
 ]
-latex_use_modindex = False
-latex_elements = {
-    'papersize': 'a4paper',
-    'pointsize': '12pt',
-    'fontpkg': r'\usepackage{mathpazo}',
-    'preamble': r'\usepackage{flaskstyle}',
-}
-latex_use_parts = True
-latex_additional_files = ['flaskstyle.sty', 'logo.pdf']
-
-# linkcheck ------------------------------------------------------------
-
-linkcheck_anchors = False
 
 # Local Extensions -----------------------------------------------------
 
-def unwrap_decorators():
-    import sphinx.util.inspect as inspect
-    import functools
 
-    old_getargspec = inspect.getargspec
+def github_link(name, rawtext, text, lineno, inliner, options=None, content=None):
-    def getargspec(x):
-        return old_getargspec(getattr(x, '_original_function', x))
-    inspect.getargspec = getargspec
-
-    old_update_wrapper = functools.update_wrapper
-    def update_wrapper(wrapper, wrapped, *a, **kw):
-        rv = old_update_wrapper(wrapper, wrapped, *a, **kw)
-        rv._original_function = wrapped
-        return rv
-    functools.update_wrapper = update_wrapper
-
-
-unwrap_decorators()
-del unwrap_decorators
-
-
-_internal_mark_re = re.compile(r'^\s*:internal:\s*$(?m)', re.M)
-
-
-def skip_internal(app, what, name, obj, skip, options):
-    docstring = inspect.getdoc(obj) or ''
-
-    if skip or _internal_mark_re.search(docstring) is not None:
-        return True
-
-
-def cut_module_meta(app, what, name, obj, options, lines):
-    """Remove metadata from autodoc output."""
-    if what != 'module':
-        return
-
-    lines[:] = [
-        line for line in lines
-        if not line.startswith((':copyright:', ':license:'))
-    ]
-
-
-def github_link(
-    name, rawtext, text, lineno, inliner, options=None, content=None
-):
     app = inliner.document.settings.env.app
     release = app.config.release
-    base_url = 'https://github.com/pallets/flask/tree/'
+    base_url = "https://github.com/pallets/flask/tree/"
 
-    if text.endswith('>'):
+    if text.endswith(">"):
-        words, text = text[:-1].rsplit('<', 1)
+        words, text = text[:-1].rsplit("<", 1)
         words = words.strip()
     else:
         words = None
 
-    if release.endswith('dev'):
+    if packaging.version.parse(release).is_devrelease:
-        url = '{0}master/{1}'.format(base_url, text)
+        url = "{0}master/{1}".format(base_url, text)
     else:
-        url = '{0}{1}/{2}'.format(base_url, release, text)
+        url = "{0}{1}/{2}".format(base_url, release, text)
 
     if words is None:
         words = url
 
     from docutils.nodes import reference
     from docutils.parsers.rst.roles import set_classes
+
     options = options or {}
     set_classes(options)
     node = reference(rawtext, words, refuri=url, **options)
@@ -165,6 +93,4 @@ def github_link(
 
 
 def setup(app):
-    app.connect('autodoc-skip-member', skip_internal)
+    app.add_role("gh", github_link)
-    app.connect('autodoc-process-docstring', cut_module_meta)
-    app.add_role('gh', github_link)

docs/index.rst

@@ -1,12 +1,12 @@
-:orphan:
+.. rst-class:: hide-header
 
 Welcome to Flask
 ================
 
-.. image:: _static/logo-full.png
+.. image:: _static/flask-logo.png
-   :alt: Flask: web development, one drop at a time
+    :alt: Flask: web development, one drop at a time
-   :class: floatingflask
+    :align: center
-   :align: right
+    :target: https://palletsprojects.com/p/flask/
 
 Welcome to Flask's documentation.  This documentation is divided into
 different parts.  I recommend that you get started with

docs/make.bat

@@ -9,7 +9,6 @@ if "%SPHINXBUILD%" == "" (
 )
 set SOURCEDIR=.
 set BUILDDIR=_build
-set SPHINXPROJ=Flask
 
 if "%1" == "" goto help
 
@@ -26,11 +25,11 @@ if errorlevel 9009 (
 	exit /b 1
 )
 
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 goto end
 
 :help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 
 :end
 popd

docs/requirements.txt

@@ -0,0 +1,5 @@
+Sphinx~=2.2.0
+Pallets-Sphinx-Themes~=1.2.2
+sphinxcontrib-log-cabinet~=1.0.1
+sphinx-issues~=1.2.0
+packaging~=19.2