diff -Nru python-openstackdocstheme-2.2.7/AUTHORS python-openstackdocstheme-2.3.0/AUTHORS --- python-openstackdocstheme-2.2.7/AUTHORS 2020-12-02 20:52:11.000000000 +0000 +++ python-openstackdocstheme-2.3.0/AUTHORS 2021-06-02 15:43:46.000000000 +0000 @@ -15,6 +15,7 @@ Christian Berendt Corey Bryant Cory Benfield +Daniel Bengtsson Dave Walker (Daviey) Dean Troyer Doug Hellmann @@ -58,6 +59,7 @@ Thierry Carrez Thomas Bechtold Tony Breeds +YuehuiLei blue55 chenxing chenxing diff -Nru python-openstackdocstheme-2.2.7/ChangeLog python-openstackdocstheme-2.3.0/ChangeLog --- python-openstackdocstheme-2.2.7/ChangeLog 2020-12-02 20:52:11.000000000 +0000 +++ python-openstackdocstheme-2.3.0/ChangeLog 2021-06-02 15:43:46.000000000 +0000 @@ -1,6 +1,19 @@ CHANGES ======= +2.3.0 +----- + +* Inherit from base "basic" template +* sphinx 4.0: Handle HTML 5 changes +* sphinx 4.0: Fix sphinx.ext.extlinks.make\_link\_role call +* tox: Toggle 'usedevelop' +* trivial: Fix indentation +* Change to OFTC +* setup.cfg: Replace dashes with underscores +* Move flake8 as a pre-commit local target +* Use TOX\_CONSTRAINTS\_FILE + 2.2.7 ----- diff -Nru python-openstackdocstheme-2.2.7/debian/changelog python-openstackdocstheme-2.3.0/debian/changelog --- python-openstackdocstheme-2.2.7/debian/changelog 2020-12-07 17:45:27.000000000 +0000 +++ python-openstackdocstheme-2.3.0/debian/changelog 2021-06-09 07:39:12.000000000 +0000 @@ -1,8 +1,9 @@ -python-openstackdocstheme (2.2.7-0ubuntu2) hirsute; urgency=medium +python-openstackdocstheme (2.3.0-0ubuntu1) impish; urgency=medium - * No-change rebuild to drop python3.8 extensions. + * New upstream release for OpenStack Xena. + * d/p/patch-out-external-references.patch: Refreshed. - -- Matthias Klose Mon, 07 Dec 2020 18:45:27 +0100 + -- Chris MacNaughton Wed, 09 Jun 2021 07:39:12 +0000 python-openstackdocstheme (2.2.7-0ubuntu1) hirsute; urgency=medium diff -Nru python-openstackdocstheme-2.2.7/debian/patches/patch-out-external-references.patch python-openstackdocstheme-2.3.0/debian/patches/patch-out-external-references.patch --- python-openstackdocstheme-2.2.7/debian/patches/patch-out-external-references.patch 2020-12-03 17:25:04.000000000 +0000 +++ python-openstackdocstheme-2.3.0/debian/patches/patch-out-external-references.patch 2021-06-09 07:39:12.000000000 +0000 @@ -25,10 +25,10 @@ - --- a/openstackdocstheme/theme/openstackdocs/layout.html +++ b/openstackdocstheme/theme/openstackdocs/layout.html -@@ -19,19 +19,6 @@ - {% if favicon %} - - {% endif %} +@@ -3,19 +3,6 @@ + {% block extrahead %} + + {% include 'css.html' %} -{% if theme_analytics_tracking_code %} - - - -{% endif %} - - - {% include 'header.html' %} + {% endblock %} + + {%- block header %} --- a/openstackdocstheme/theme/openstackdocs/script_search.html +++ b/openstackdocstheme/theme/openstackdocs/script_search.html @@ -1,4 +1,3 @@ diff -Nru python-openstackdocstheme-2.2.7/openstackdocstheme/ext.py python-openstackdocstheme-2.3.0/openstackdocstheme/ext.py --- python-openstackdocstheme-2.2.7/openstackdocstheme/ext.py 2020-12-02 20:51:30.000000000 +0000 +++ python-openstackdocstheme-2.3.0/openstackdocstheme/ext.py 2021-06-02 15:43:14.000000000 +0000 @@ -19,6 +19,7 @@ import dulwich.repo from pbr import packaging +import sphinx from sphinx.ext import extlinks from sphinx.util import logging @@ -298,7 +299,13 @@ role_name, url, ) - app.add_role(role_name, extlinks.make_link_role(url, project_name)) + + if sphinx.version_info >= (4, 0, 0): + role = extlinks.make_link_role(project_name, url, project_name) + else: + role = extlinks.make_link_role(url, project_name) + + app.add_role(role_name, role) def _find_setup_cfg(srcdir): diff -Nru python-openstackdocstheme-2.2.7/openstackdocstheme/theme/openstackdocs/layout.html python-openstackdocstheme-2.3.0/openstackdocstheme/theme/openstackdocs/layout.html --- python-openstackdocstheme-2.2.7/openstackdocstheme/theme/openstackdocs/layout.html 2020-12-02 20:51:30.000000000 +0000 +++ python-openstackdocstheme-2.3.0/openstackdocstheme/theme/openstackdocs/layout.html 2021-06-02 15:43:14.000000000 +0000 @@ -1,24 +1,8 @@ - - - - -{% block header %}{% endblock %} - {{ theme_root_title|striptags }}: {{ title|striptags }} - - - -{{ metatags }} +{% extends "basic/layout.html" %} + +{% block extrahead %} + {% include 'css.html' %} -{%- for cssfile in css_files %} - -{%- endfor %} -{%- for js in script_files %} - -{%- endfor %} - {# FAVICON #} -{% if favicon %} - -{% endif %} {% if theme_analytics_tracking_code %} {% endif %} - - +{% endblock %} + +{%- block header %} {% include 'header.html' %} +{% endblock %} + +{%- block relbar1 %}{% endblock %} + +{%- block content %}
@@ -80,6 +70,11 @@ {% include 'sidebartoc.html' %}
+{%- endblock %} + +{%- block relbar2 %}{% endblock %} + +{%- block footer %} {% include 'footer.html' %} {% include 'script_footer.html' %} {% block script_footer %}{% endblock %} @@ -99,5 +94,4 @@
{% endif %} - - +{%- endblock %} diff -Nru python-openstackdocstheme-2.2.7/openstackdocstheme/theme/openstackdocs/static/css/combined.css python-openstackdocstheme-2.3.0/openstackdocstheme/theme/openstackdocs/static/css/combined.css --- python-openstackdocstheme-2.2.7/openstackdocstheme/theme/openstackdocs/static/css/combined.css 2020-12-02 20:51:30.000000000 +0000 +++ python-openstackdocstheme-2.3.0/openstackdocstheme/theme/openstackdocs/static/css/combined.css 2021-06-02 15:43:14.000000000 +0000 @@ -374,31 +374,31 @@ /*Docs Version Dropdown*/ .version-dropdown { - font-size: 10px; - color: #9eb5c3; - text-transform: uppercase; - position: relative; - display: inline-block; - vertical-align: middle; - margin-right: 8px; - margin-bottom: 6px; - border: solid 1px; - padding: 3px 5px 3px 5px; } + font-size: 10px; + color: #9eb5c3; + text-transform: uppercase; + position: relative; + display: inline-block; + vertical-align: middle; + margin-right: 8px; + margin-bottom: 6px; + border: solid 1px; + padding: 3px 5px 3px 5px; } .version-dropdown-content { - display: none; - text-align: left; - position: absolute; - background-color: #f9f9f9; - min-width: 160px; - box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2); - padding: 12px 16px; - top: 25px; - right: 5px; - z-index: 1; } + display: none; + text-align: left; + position: absolute; + background-color: #f9f9f9; + min-width: 160px; + box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2); + padding: 12px 16px; + top: 25px; + right: 5px; + z-index: 1; } .version-dropdown:hover .version-dropdown-content { - display: block; } + display: block; } /*Docs Book View*/ .docs-book-wrapper { @@ -722,7 +722,6 @@ margin: 0 0 10px; padding: 20px 30px; } -/* TODO(stephenfin): Did this change in Sphinx 2.0? */ pre code, pre .line-number { font-family: "Courier New", Courier, Monospace; @@ -741,16 +740,20 @@ display: block; padding: 0 0.5em 0 1em; } +.pre { + font-family: "Courier New", Courier, Monospace; +} + div.sidebar { - margin: 0 0 0.5em 1em; - border: 1px solid #ddb; - padding: 7px 7px 0 7px; - background-color: #ffe; - width: 40%; - float: right; } + margin: 0 0 0.5em 1em; + border: 1px solid #ddb; + padding: 7px 7px 0 7px; + background-color: #ffe; + width: 40%; + float: right; } p.sidebar-title { - font-weight: bold; } + font-weight: bold; } .admonition { background: #eee; @@ -907,7 +910,7 @@ display: inline-block; } div.tooltip-inner { - max-width: 350px; } + max-width: 350px; } table.highlighttable { width: 100%; } @@ -935,11 +938,10 @@ /* for search result highlighting */ span.highlighted { - background-color: #fbe54e; } + background-color: #fbe54e; } /* handle rst rubric directives */ p.rubric { - margin-top: 30px; - font-weight: bold; + margin-top: 30px; + font-weight: bold; } - diff -Nru python-openstackdocstheme-2.2.7/openstackdocstheme/theme/openstackdocs/static/js/docs.js python-openstackdocstheme-2.3.0/openstackdocstheme/theme/openstackdocs/static/js/docs.js --- python-openstackdocstheme-2.2.7/openstackdocstheme/theme/openstackdocs/static/js/docs.js 2020-12-02 20:51:30.000000000 +0000 +++ python-openstackdocstheme-2.3.0/openstackdocstheme/theme/openstackdocs/static/js/docs.js 2021-06-02 15:43:14.000000000 +0000 @@ -45,7 +45,7 @@ "If you have a troubleshooting or support issue, use the following " + " resources:" + lineFeed + lineFeed + " - The mailing list: https://lists.openstack.org" + lineFeed + - " - IRC: 'openstack' channel on Freenode"+ lineFeed; + " - IRC: 'openstack' channel on OFTC"+ lineFeed; var urlBase = "https://bugs.launchpad.net/" + bugProject + "/+filebug?field.title="; var currentURL = "URL: " + window.location.href; diff -Nru python-openstackdocstheme-2.2.7/openstackdocstheme/theme/starlingxdocs/static/css/combined.css python-openstackdocstheme-2.3.0/openstackdocstheme/theme/starlingxdocs/static/css/combined.css --- python-openstackdocstheme-2.2.7/openstackdocstheme/theme/starlingxdocs/static/css/combined.css 2020-12-02 20:51:30.000000000 +0000 +++ python-openstackdocstheme-2.3.0/openstackdocstheme/theme/starlingxdocs/static/css/combined.css 2021-06-02 15:43:14.000000000 +0000 @@ -374,31 +374,31 @@ /*Docs Version Dropdown*/ .version-dropdown { - font-size: 10px; - color: #9eb5c3; - text-transform: uppercase; - position: relative; - display: inline-block; - vertical-align: middle; - margin-right: 8px; - margin-bottom: 6px; - border: solid 1px; - padding: 3px 5px 3px 5px; } + font-size: 10px; + color: #9eb5c3; + text-transform: uppercase; + position: relative; + display: inline-block; + vertical-align: middle; + margin-right: 8px; + margin-bottom: 6px; + border: solid 1px; + padding: 3px 5px 3px 5px; } .version-dropdown-content { - display: none; - text-align: left; - position: absolute; - background-color: #f9f9f9; - min-width: 160px; - box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2); - padding: 12px 16px; - top: 25px; - right: 5px; - z-index: 1; } + display: none; + text-align: left; + position: absolute; + background-color: #f9f9f9; + min-width: 160px; + box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2); + padding: 12px 16px; + top: 25px; + right: 5px; + z-index: 1; } .version-dropdown:hover .version-dropdown-content { - display: block; } + display: block; } /*Docs Book View*/ .docs-book-wrapper { @@ -722,7 +722,6 @@ margin: 0 0 10px; padding: 20px 30px; } -/* TODO(stephenfin): Did this change in Sphinx 2.0? */ pre code, pre .line-number { font-family: "Courier New", Courier, Monospace; @@ -741,16 +740,20 @@ display: block; padding: 0 0.5em 0 1em; } +.pre { + font-family: "Courier New", Courier, Monospace; +} + div.sidebar { - margin: 0 0 0.5em 1em; - border: 1px solid #ddb; - padding: 7px 7px 0 7px; - background-color: #ffe; - width: 40%; - float: right; } + margin: 0 0 0.5em 1em; + border: 1px solid #ddb; + padding: 7px 7px 0 7px; + background-color: #ffe; + width: 40%; + float: right; } p.sidebar-title { - font-weight: bold; } + font-weight: bold; } .admonition { background: #eee; @@ -907,7 +910,7 @@ display: inline-block; } div.tooltip-inner { - max-width: 350px; } + max-width: 350px; } table.highlighttable { width: 100%; } @@ -935,11 +938,10 @@ /* for search result highlighting */ span.highlighted { - background-color: #fbe54e; } + background-color: #fbe54e; } /* handle rst rubric directives */ p.rubric { - margin-top: 30px; - font-weight: bold; + margin-top: 30px; + font-weight: bold; } - diff -Nru python-openstackdocstheme-2.2.7/openstackdocstheme.egg-info/pbr.json python-openstackdocstheme-2.3.0/openstackdocstheme.egg-info/pbr.json --- python-openstackdocstheme-2.2.7/openstackdocstheme.egg-info/pbr.json 2020-12-02 20:52:11.000000000 +0000 +++ python-openstackdocstheme-2.3.0/openstackdocstheme.egg-info/pbr.json 2021-06-02 15:43:46.000000000 +0000 @@ -1 +1 @@ -{"git_version": "c7f7eec", "is_release": true} \ No newline at end of file +{"git_version": "08461c5", "is_release": true} \ No newline at end of file diff -Nru python-openstackdocstheme-2.2.7/openstackdocstheme.egg-info/PKG-INFO python-openstackdocstheme-2.3.0/openstackdocstheme.egg-info/PKG-INFO --- python-openstackdocstheme-2.2.7/openstackdocstheme.egg-info/PKG-INFO 2020-12-02 20:52:11.000000000 +0000 +++ python-openstackdocstheme-2.3.0/openstackdocstheme.egg-info/PKG-INFO 2021-06-02 15:43:46.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: openstackdocstheme -Version: 2.2.7 +Version: 2.3.0 Summary: OpenStack Docs Theme Home-page: https://docs.openstack.org/openstackdocstheme/latest/ Author: OpenStack diff -Nru python-openstackdocstheme-2.2.7/PKG-INFO python-openstackdocstheme-2.3.0/PKG-INFO --- python-openstackdocstheme-2.2.7/PKG-INFO 2020-12-02 20:52:12.293508800 +0000 +++ python-openstackdocstheme-2.3.0/PKG-INFO 2021-06-02 15:43:46.276785600 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: openstackdocstheme -Version: 2.2.7 +Version: 2.3.0 Summary: OpenStack Docs Theme Home-page: https://docs.openstack.org/openstackdocstheme/latest/ Author: OpenStack diff -Nru python-openstackdocstheme-2.2.7/.pre-commit-config.yaml python-openstackdocstheme-2.3.0/.pre-commit-config.yaml --- python-openstackdocstheme-2.2.7/.pre-commit-config.yaml 2020-12-02 20:51:29.000000000 +0000 +++ python-openstackdocstheme-2.3.0/.pre-commit-config.yaml 2021-06-02 15:43:14.000000000 +0000 @@ -9,7 +9,7 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: ebc15addedad713c86ef18ae9632c88e187dd0af # v3.1.0 + rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0 hooks: - id: trailing-whitespace # Replaces or checks mixed line ending @@ -27,9 +27,13 @@ - id: debug-statements - id: check-yaml files: .*\.(yaml|yml)$ - - repo: https://gitlab.com/pycqa/flake8 - rev: 181bb46098dddf7e2d45319ea654b4b4d58c2840 # 3.8.3 + - repo: local hooks: - id: flake8 + name: flake8 additional_dependencies: - hacking>=3.0.1,<3.1.0 + language: python + entry: flake8 + files: '^.*\.py$' + exclude: '^(doc|releasenotes|tools)/.*$' diff -Nru python-openstackdocstheme-2.2.7/setup.cfg python-openstackdocstheme-2.3.0/setup.cfg --- python-openstackdocstheme-2.2.7/setup.cfg 2020-12-02 20:52:12.293508800 +0000 +++ python-openstackdocstheme-2.3.0/setup.cfg 2021-06-02 15:43:46.276785600 +0000 @@ -1,12 +1,12 @@ [metadata] name = openstackdocstheme summary = OpenStack Docs Theme -description-file = +description_file = README.rst author = OpenStack -author-email = openstack-discuss@lists.openstack.org -home-page = https://docs.openstack.org/openstackdocstheme/latest/ -python-requires = >=3.6 +author_email = openstack-discuss@lists.openstack.org +home_page = https://docs.openstack.org/openstackdocstheme/latest/ +python_requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology diff -Nru python-openstackdocstheme-2.2.7/tox.ini python-openstackdocstheme-2.3.0/tox.ini --- python-openstackdocstheme-2.2.7/tox.ini 2020-12-02 20:51:30.000000000 +0000 +++ python-openstackdocstheme-2.3.0/tox.ini 2021-06-02 15:43:14.000000000 +0000 @@ -5,9 +5,9 @@ [testenv] basepython = python3 -usedevelop = False +usedevelop = true deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/upper-constraints.txt} + -c{env:TOX_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/upper-constraints.txt} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt