Merge branch 'main' into alias-system

Author: seisman

.github/workflows/ci_docs.yml

@@ -114,7 +114,7 @@ jobs:
             sphinx-copybutton
             sphinx-design
             sphinx-gallery
-            sphinx_rtd_theme<3.0
+            sphinx_rtd_theme
             cairosvg
             sphinxcontrib-svg2pdfconverter
             tectonic

.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
     - id: chmod
       args: ['644']
 - repo: https://github.com/woodruffw/zizmor-pre-commit
-  rev: v1.5.1
+  rev: v1.5.2
   hooks:
   - id: zizmor
 

ci/requirements/docs.yml

@@ -31,7 +31,7 @@ dependencies:
     - sphinx-copybutton
     - sphinx-design
     - sphinx-gallery
-    - sphinx_rtd_theme<3.0
+    - sphinx_rtd_theme
     # Dev dependencies (building PDF documentation)
     # 'sphinxcontrib-svg2pdfconverter' is required since it's added to `extensions`.
     - sphinxcontrib-svg2pdfconverter

doc/_static/style.css

@@ -52,6 +52,15 @@ p {
     max-width: 1000px;
 }
 
+/* Compatibility with sphinx_rtd_theme v3.x.x */
+/* https://github.com/TexasInstruments/processor-sdk-doc/commit/4fa6276ddcf7f9db919af2e5b3aec7e70a1afa16 */
+.wy-side-nav-search>div.version {
+    margin-top: -.4045em;
+    margin-bottom: .809em;
+    font-weight: 400;
+    color: hsla(0, 0%, 100%, .3);
+}
+
 /* Format parameters section similar to sphinx_rtd_theme v4.x.x (not a grid) */
 html.writer-html5 .rst-content dl.field-list {
     display: initial;

doc/_templates/layout.html

@@ -31,24 +31,25 @@
 {% endblock %}
 
 
-{% block sidebartitle %}
-    <a href="{{ pathto(root_doc) }}"><h2 class="sidebar-title">{{ project }}</h2></a>
-
-    {% if theme_display_version %}
-        {%- set nav_version = version %}
-        {% if READTHEDOCS and current_version %}
-            {%- set nav_version = current_version %}
-        {% endif %}
-        {% if nav_version %}
-            <div class="version">
-                {{ nav_version }}
-            </div>
-        {% endif %}
-    {% endif %}
-
-    {% include "searchbox.html" %}
-
-{% endblock %}
+{%- block sidebartitle %}
+   {# the logo helper function was removed in Sphinx 6 and deprecated since Sphinx 4 #}
+   {# the master_doc variable was renamed to root_doc in Sphinx 4 (master_doc still exists in later Sphinx versions) #}
+   {%- set _logo_url = logo_url|default(pathto('_static/' + (logo or ""), 1)) %}
+   {%- set _root_doc = root_doc|default(master_doc) %}
+   <a href="{{ pathto(_root_doc) }}">
+     {% if not theme_logo_only %}<h2 class="sidebar-title">{{ project }}</h2>{% endif %}
+     {%- if logo or logo_url %}
+       <img src="{{ _logo_url }}" class="logo" alt="{{ _('Logo') }}"/>
+     {%- endif %}
+   </a>
+   {%- set nav_version = version %}
+   {%- if nav_version %}
+     <div class="version">
+       {{ nav_version }}
+     </div>
+   {%- endif %}
+   {%- include "searchbox.html" %}
+ {% endblock %}
 
 
 {% block menu %}

environment.yml

@@ -43,7 +43,7 @@ dependencies:
     - sphinx-copybutton
     - sphinx-design
     - sphinx-gallery>=0.19.0
-    - sphinx_rtd_theme<3.0
+    - sphinx_rtd_theme
     # Dev dependencies (building PDF documentation)
     - cairosvg
     - sphinxcontrib-svg2pdfconverter

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=64", "setuptools_scm[toml]>=6.2"]
+requires = ["setuptools>=77", "setuptools_scm[toml]>=6.2"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -8,6 +8,8 @@ description = "A Python interface for the Generic Mapping Tools"
 readme = "README.md"
 requires-python = ">=3.11"
 authors = [{name = "The PyGMT Developers", email = "[email protected]"}]
+license = "BSD-3-Clause"
+license-files = ["LICENSE.txt"]
 keywords = [
     "cartography",
     "geodesy",
@@ -31,7 +33,6 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
-    "License :: OSI Approved :: BSD License",
 ]
 dependencies = [
     "numpy>=1.25",
@@ -58,9 +59,6 @@ all = [
 "Changelog" = "https://www.pygmt.org/latest/changes.html"
 "Issue Tracker" = "https://github.com/GenericMappingTools/pygmt/issues"
 
-[tool.setuptools]
-license-files = ["LICENSE.txt"]
-
 [tool.setuptools.packages.find]
 include = ["pygmt*"]
 exclude = ["doc"]