Update site packages

addons/source-python/packages/site-packages/alabaster/__init__.py

@@ -1,6 +1,7 @@
 import os
 
-from alabaster import _version as version
+__version_info__ = (1, 0, 0)
+__version__ = "1.0.0"
 
 
 def get_path():
@@ -12,9 +13,27 @@ def get_path():
 
 
 def update_context(app, pagename, templatename, context, doctree):
-    context['alabaster_version'] = version.__version__
+    context["alabaster_version"] = __version__
+    context["alabaster_version_info"] = __version_info__
+
+    # Convert 'show_powered_by' in the theme options to
+    # the preferred option, html_show_sphinx.
+    html_theme_options = app.config.html_theme_options
+    if "show_powered_by" in html_theme_options:
+        show_powered_by = html_theme_options["show_powered_by"]
+        if isinstance(show_powered_by, str):
+            context["show_sphinx"] = show_powered_by.lower() == "true"
+        else:
+            context["show_sphinx"] = bool(show_powered_by)  # to allow int values
+
 
 def setup(app):
-    app.connect('html-page-context', update_context)
-    return {'version': version.__version__,
-            'parallel_read_safe': True}
+    app.require_sphinx("6.2")
+    theme_path = os.path.abspath(os.path.dirname(__file__))
+    app.add_html_theme("alabaster", theme_path)
+    app.connect("html-page-context", update_context)
+    return {
+        "version": __version__,
+        "parallel_read_safe": True,
+        "parallel_write_safe": True,
+    }

addons/source-python/packages/site-packages/alabaster/about.html

@@ -1,9 +1,11 @@
 {% if theme_logo %}
 <p class="logo">
   <a href="{{ pathto(master_doc) }}">
-    <img class="logo" src="{{ pathto('_static/' ~ theme_logo, 1) }}" alt="Logo"/>
+    <img class="logo" src="{{ pathto('_static/' ~ theme_logo, 1) }}" alt="Logo" />
     {% if theme_logo_name|lower == 'true' %}
     <h1 class="logo logo-name">{{ project }}</h1>
+    {% elif theme_logo_name|lower != 'false' %}
+    <h1 class="logo logo-name">{{ theme_logo_name }}</h1>
     {% endif %}
   </a>
 </p>
@@ -31,10 +33,10 @@ <h1 class="logo"><a href="{{ pathto(master_doc) }}">{{ project }}</a></h1>
     {% set path = theme_travis_button %}
 {% endif %}
 <p>
-<a href="https://travis-ci.org/{{ path }}">
+<a class="badge" href="https://travis-ci.org/{{ path }}">
     <img
-        alt="https://secure.travis-ci.org/{{ path }}.svg?branch=master"
-        src="https://secure.travis-ci.org/{{ path }}.svg?branch=master"
+        alt="https://secure.travis-ci.org/{{ path }}.svg?branch={{ theme_badge_branch }}"
+        src="https://secure.travis-ci.org/{{ path }}.svg?branch={{ theme_badge_branch }}"
     />
 </a>
 </p>
@@ -47,10 +49,10 @@ <h1 class="logo"><a href="{{ pathto(master_doc) }}">{{ project }}</a></h1>
     {% set path = theme_codecov_button %}
 {% endif %}
 <p>
-<a href="https://codecov.io/github/{{ path }}">
+<a class="badge" href="https://codecov.io/github/{{ path }}">
     <img
-    alt="https://codecov.io/github/{{ path }}/coverage.svg?branch=master"
-    src="https://codecov.io/github/{{ path }}/coverage.svg?branch=master"
+    alt="https://codecov.io/github/{{ path }}/coverage.svg?branch={{ theme_badge_branch }}"
+    src="https://codecov.io/github/{{ path }}/coverage.svg?branch={{ theme_badge_branch }}"
     />
 </a>
 </p>

addons/source-python/packages/site-packages/alabaster/donate.html

@@ -1,9 +1,28 @@
-{% if theme_gratipay_user or theme_gittip_user %}
-<h3>Donate</h3>
+{# TODO: wrap all these in their own divs for easier styling #}
+
+{% if theme_donate_url or theme_opencollective or theme_tidelift_url %}
+<h3 class="donation">Donate/support</h3>
+{% endif %}
+
+{% if theme_donate_url %}
+<p>
+<a class="badge" href="{{ theme_donate_url }}">
+<img src="https://img.shields.io/badge/donate-%E2%9D%A4%C2%A0-ff69b4.svg?style=flat" alt="Donate">
+</a>
+</p>
+{% endif %}
+
+{% if theme_opencollective %}
+<p>
+<a class="badge" href="https://opencollective.com/{{ theme_opencollective }}/donate" target="_blank">
+  <img src="https://opencollective.com/{{ theme_opencollective }}/donate/button.png?color={{ theme_opencollective_button_color }}" width=300 />
+</a>
+</p>
+{% endif %}
+
+{% if theme_tidelift_url %}
 <p>
-Consider supporting the authors on <a href="https://www.gratipay.com/">Gratipay</a>:
-<script data-gratipay-username="{{ theme_gratipay_user or theme_gittip_user }}"
-        data-gratipay-widget="button"
-        src="//gttp.co/v1.js"></script>
+Professionally-supported {{ project }} is available with the
+<a href="{{ theme_tidelift_url }}">Tidelift Subscription</a>.
 </p>
 {% endif %}

addons/source-python/packages/site-packages/alabaster/layout.html

@@ -2,14 +2,41 @@
 
 {%- block extrahead %}
   {{ super() }}
-  <link rel="stylesheet" href="{{ pathto('_static/custom.css', 1) }}" type="text/css" />
+  <link rel="stylesheet" href="{{ pathto('_static/custom.css', resource=True) }}" type="text/css" />
   {% if theme_touch_icon %}
-    <link rel="apple-touch-icon" href="{{ pathto('_static/' ~ theme_touch_icon, 1) }}" />
+    <link rel="apple-touch-icon" href="{{ pathto('_static/' ~ theme_touch_icon, resource=True) }}" />
+  {% endif %}
+
+  {# Deprecated in favor of html_baseurl (pageurl). This is already set in the basic theme #}
+  {% if theme_canonical_url and not pageurl %}
+    <link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html" />
   {% endif %}
-  <meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
 {% endblock %}
 
-{# Disable base theme's top+bottom related navs; we have our own in sidebar #}
+{# top+bottom related navs; we also have our own in sidebar #}
+{%- macro rellink_markup() %}
+  <nav id="rellinks">
+    <ul>
+      {%- if prev %}
+        <li>
+          &larr;
+          <a href="{{ prev.link|e }}" title="Previous document">{{ prev.title }}</a>
+        </li>
+      {%- endif %}
+      {%- if next %}
+        <li>
+          <a href="{{ next.link|e }}" title="Next document">{{ next.title }}</a>
+          &rarr;
+        </li>
+      {%- endif %}
+    </ul>
+  </nav>
+{%- endmacro %}
+
+{%- set theme_show_relbar_top = theme_show_relbar_top or theme_show_relbars %}
+{%- set theme_show_relbar_bottom = theme_show_relbar_bottom or theme_show_relbars %}
+
+{# removed existing top+bottom related nav, and embed in main content #}
 {%- block relbar1 %}{% endblock %}
 {%- block relbar2 %}{% endblock %}
 
@@ -23,9 +50,29 @@
       {%- if render_sidebar %}
         <div class="bodywrapper">
       {%- endif %}
+
+          {%- block relbar_top %}
+            {%- if theme_show_relbar_top|tobool %}
+              <div class="related top">
+                &nbsp;
+                {{- rellink_markup () }}
+              </div>
+            {%- endif %}
+          {% endblock %}
+
           <div class="body" role="main">
             {% block body %} {% endblock %}
           </div>
+
+          {%- block relbar_bottom %}
+            {%- if theme_show_relbar_bottom|tobool %}
+              <div class="related bottom">
+                &nbsp;
+                {{- rellink_markup () }}
+              </div>
+            {%- endif %}
+          {% endblock %}
+
       {%- if render_sidebar %}
         </div>
       {%- endif %}
@@ -40,27 +87,31 @@
 
 {%- block footer %}
     <div class="footer">
-      {% if show_copyright %}&copy;{{ copyright }}.{% endif %}
-      {% if theme_show_powered_by|lower == 'true' %}
+      {% if show_copyright %}&#169;{{ copyright }}.{% endif %}
+      {% if show_sphinx %}
       {% if show_copyright %}|{% endif %}
-      Powered by <a href="http://sphinx-doc.org/">Sphinx {{ sphinx_version }}</a>
-      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster {{ alabaster_version }}</a>
+      Powered by <a href="https://www.sphinx-doc.org/">Sphinx {{ sphinx_version }}</a>
+      &amp; <a href="https://alabaster.readthedocs.io">Alabaster {{ alabaster_version }}</a>
       {% endif %}
       {%- if show_source and has_source and sourcename %}
-      {% if show_copyright or theme_show_powered_by %}|{% endif %}
-      <a href="{{ pathto('_sources/' + sourcename, true)|e }}"
+      {% if show_copyright or show_sphinx %}|{% endif %}
+      <a href="{{ pathto('_sources/' + sourcename, resource=True)|e }}"
           rel="nofollow">{{ _('Page source') }}</a>
       {%- endif %}
     </div>
 
     {% if theme_github_banner|lower != 'false' %}
     <a href="https://github.com/{{ theme_github_user }}/{{ theme_github_repo }}" class="github">
-        <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ pathto('_static/' ~ theme_github_banner, 1) if theme_github_banner|lower != 'true' else 'https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png' }}" alt="Fork me on GitHub"  class="github"/>
+        {%- if theme_github_banner|lower == 'true' %}
+        <img src="{{ pathto('_static/github-banner.svg', resource=True) }}" alt="Fork me on GitHub" class="github"/>
+        {%- else %}
+        <img src="{{ pathto('_static/' ~ theme_github_banner, resource=True) }}" alt="Fork me on GitHub" class="github"/>
+        {%- endif %}
     </a>
     {% endif %}
 
     {% if theme_analytics_id %}
-    <script type="text/javascript">
+    <script>
 
       var _gaq = _gaq || [];
       _gaq.push(['_setAccount', '{{ theme_analytics_id }}']);
@@ -69,8 +120,8 @@
       _gaq.push(['_trackPageview']);
 
       (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var ga = document.createElement('script'); ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'https://www') + '.google-analytics.com/ga.js';
         var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
       })();
 

addons/source-python/packages/site-packages/alabaster/navigation.html

@@ -1,5 +1,5 @@
 <h3>{{ _('Navigation') }}</h3>
-{{ toctree(includehidden=theme_sidebar_includehidden) }}
+{{ toctree(includehidden=theme_sidebar_includehidden, collapse=theme_sidebar_collapse) }}
 {% if theme_extra_nav_links %}
 <hr />
 <ul>

addons/source-python/packages/site-packages/alabaster/relations.html

@@ -1,16 +1,16 @@
 <div class="relations">
-<h3>Related Topics</h3>
+<h3>{{ _('Related Topics') }}</h3>
 <ul>
-  <li><a href="{{ pathto(master_doc) }}">Documentation overview</a><ul>
+  <li><a href="{{ pathto(master_doc) }}">{{ _('Documentation overview') }}</a><ul>
   {%- for parent in parents %}
   <li><a href="{{ parent.link|e }}">{{ parent.title }}</a><ul>
   {%- endfor %}
     {%- if prev %}
-      <li>Previous: <a href="{{ prev.link|e }}" title="{{ _('previous chapter')
+      <li>{{ _('Previous') }}: <a href="{{ prev.link|e }}" title="{{ _('previous chapter')
         }}">{{ prev.title }}</a></li>
     {%- endif %}
     {%- if next %}
-      <li>Next: <a href="{{ next.link|e }}" title="{{ _('next chapter')
+      <li>{{ _('Next') }}: <a href="{{ next.link|e }}" title="{{ _('next chapter')
         }}">{{ next.title }}</a></li>
     {%- endif %}
   {%- for parent in parents %}