From 965fa039ac9b67b6960e2431f06282938335f2e4 Mon Sep 17 00:00:00 2001
From: Jonathan Visser <jonathan.visser@team.blue>
Date: Wed, 27 Aug 2025 14:04:22 +0200
Subject: [PATCH] Merge changes from sphinx8 into docsearch

---
 docs/_templates/layout.html | 30 +++++++++++++-----------------
 requirements/base.txt       | 12 ++++++------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index 67553226..e9f9e74e 100644
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -28,26 +28,22 @@
   {%- endblock -%}
 
   {#- CSS #}
-  {%- if sphinx_version_info < (4, 0) -%}
-    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
-  {%- endif %}
-  {%- if theme_analytics_id %}
-    <link rel="stylesheet" href="{{ pathto('_static/cookieconsent.css', 1) }}" type="text/css" />
-  {%- endif %}
-  {%- for css in css_files %}
-    {%- if css|attr("rel") %}
-      <link rel="{{ css.rel }}" href="{{ pathto(css.filename, 1) }}" type="text/css"{% if css.title is not none %} title="{{ css.title }}"{% endif %} />
+  {%- for css_file in css_files %}
+    {%- if css_file|attr("filename") %}
+      {{ css_tag(css_file) }}
     {%- else %}
-      {%- if css.filename.startswith('https://') %}
-        <link rel="stylesheet" href="{{ css.filename }}" type="text/css" />
-      {%- else %}
-        <link rel="stylesheet" href="{{ pathto(css.filename, 1) }}" type="text/css" />
-      {%- endif %}
+      <link rel="stylesheet" href="{{ pathto(css_file, 1)|escape }}" type="text/css" />
     {%- endif %}
   {%- endfor %}
-  {%- for cssfile in extra_css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
+
+  {#
+      "extra_css_files" is an undocumented Read the Docs theme specific option.
+      There is no need to check for ``|attr("filename")`` here because it's always a string.
+      Note that this option should be removed in favor of regular ``html_css_files``:
+      https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-html_css_files
+  #}
+  {%- for css_file in extra_css_files %}
+    <link rel="stylesheet" href="{{ pathto(css_file, 1)|escape }}" type="text/css" />
   {%- endfor -%}
 
   {#- FAVICON #}
diff --git a/requirements/base.txt b/requirements/base.txt
index 19a94bff..c0847b9a 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -4,18 +4,18 @@ sphinx_rtd_theme==3.0.2
 myst-parser==4.0.1
 mdit-py-plugins
 sphinx-copybutton==0.5.2
-mdformat==0.7.18
+mdformat==0.7.22
 mdformat-myst==0.2.1
-mdformat-frontmatter==0.4.1
+mdformat-frontmatter==2.0.8
 sphinx-notfound-page==1.1.0
-sphinx-sitemap==2.6.0
+sphinx-sitemap==2.8.0
 sphinx-docsearch
-GitPython==3.1.44
-ruamel.yaml==0.18.12
+GitPython==3.1.45
+ruamel.yaml==0.18.15
 
 # hypernode/ requirements
 beautifulsoup4==4.11.1
 markdownify==0.11.2
 python-slugify==6.1.2
 pyyaml==5.1
-frontmatter==3.0.7
+frontmatter==3.0.8