From ea62d071376b63617d9ce04c2f7209301ab6efc9 Mon Sep 17 00:00:00 2001
From: Angus Hollands <goosey15@gmail.com>
Date: Wed, 12 Jun 2024 11:56:24 +0100
Subject: [PATCH 1/5] fix: breaking style changes in pydata-sphinx-theme

---
 pyproject.toml                                              | 2 ++
 .../assets/styles/sections/_header-article.scss             | 4 ++--
 .../assets/styles/sections/_header-primary.scss             | 2 +-
 .../assets/styles/sections/_sidebar-primary.scss            | 4 +++-
 .../components/toggle-primary-sidebar.html                  | 4 ++--
 .../components/toggle-secondary-sidebar.html                | 4 ++--
 tests/test_build/build__header-article.html                 | 6 +++---
 7 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 2ade6497..8b740c95 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -81,11 +81,13 @@ doc = [
 test = [
     "beautifulsoup4",
     "coverage",
+    "defusedxml",
     "myst-nb",
     "pytest",
     "pytest-cov",
     "pytest-regressions",
     "sphinx_thebe",
+    "pydata-sphinx-theme>=0.15.2"
 ]
 
 [project.entry-points]
diff --git a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
index a741c647..626b47db 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
@@ -15,7 +15,7 @@
  * Sidebar toggle over-rides for PST
  */
 // Primary toggle is always visible
-label.sidebar-toggle.primary-toggle {
+button.sidebar-toggle.primary-toggle {
   @media (min-width: $breakpoint-md) {
     display: inline-block;
   }
@@ -25,7 +25,7 @@ label.sidebar-toggle.primary-toggle {
 }
 
 // Secondary toggle mimics behavior of "persistent header" div of PST
-label.sidebar-toggle.secondary-toggle {
+button.sidebar-toggle.secondary-toggle {
   @media (min-width: $breakpoint-lg) {
     display: none;
   }
diff --git a/src/sphinx_book_theme/assets/styles/sections/_header-primary.scss b/src/sphinx_book_theme/assets/styles/sections/_header-primary.scss
index d8b11583..c52f46e7 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_header-primary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_header-primary.scss
@@ -4,7 +4,7 @@
 
   // Turn these off because we'll show it in the article header
   // The primary sidebar toggle
-  label.sidebar-toggle {
+  button.sidebar-toggle {
     display: none;
   }
 }
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
index 1cb70716..05532f89 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
@@ -36,7 +36,9 @@
 // It is shown by default, and hidden with a click.
 // Mobile behavior is defined in the pydata sphinx theme
 @media (min-width: $breakpoint-lg) {
-  input#__primary:checked ~ .bd-container .bd-sidebar-primary {
+  input#pst-primary-sidebar-checkbox:checked
+    ~ .bd-container
+    .bd-sidebar-primary {
     margin-left: -$sidebar-primary-width-widescreen;
     visibility: hidden;
     opacity: 0;
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/components/toggle-primary-sidebar.html b/src/sphinx_book_theme/theme/sphinx_book_theme/components/toggle-primary-sidebar.html
index c8139e85..6b25347a 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/components/toggle-primary-sidebar.html
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/components/toggle-primary-sidebar.html
@@ -1,3 +1,3 @@
-<label class="sidebar-toggle primary-toggle btn btn-sm" for="__primary" title="Toggle primary sidebar" data-bs-placement="bottom" data-bs-toggle="tooltip">
+<button class="sidebar-toggle primary-toggle btn btn-sm" title="Toggle primary sidebar" data-bs-placement="bottom" data-bs-toggle="tooltip">
   <span class="fa-solid fa-bars"></span>
-</label>
+</button>
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/components/toggle-secondary-sidebar.html b/src/sphinx_book_theme/theme/sphinx_book_theme/components/toggle-secondary-sidebar.html
index 07459f9b..3bca5716 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/components/toggle-secondary-sidebar.html
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/components/toggle-secondary-sidebar.html
@@ -1,7 +1,7 @@
 {# The in-page Table of Contents -#}
 {% set page_toc = generate_toc_html() -%}
 {% if page_toc -%}
-<label class="sidebar-toggle secondary-toggle btn btn-sm" for="__secondary"title="Toggle secondary sidebar" data-bs-placement="bottom" data-bs-toggle="tooltip">
+<button class="sidebar-toggle secondary-toggle btn btn-sm" title="Toggle secondary sidebar" data-bs-placement="bottom" data-bs-toggle="tooltip">
     <span class="fa-solid fa-list"></span>
-</label>
+</button>
 {%- endif %}
diff --git a/tests/test_build/build__header-article.html b/tests/test_build/build__header-article.html
index ad7e3f12..4ffce98c 100644
--- a/tests/test_build/build__header-article.html
+++ b/tests/test_build/build__header-article.html
@@ -1,11 +1,11 @@
-<div class="bd-header-article">
+<div class="bd-header-article d-print-none">
  <div class="header-article-items header-article__inner">
   <div class="header-article-items__start">
    <div class="header-article-item">
-    <label class="sidebar-toggle primary-toggle btn btn-sm" data-bs-placement="bottom" data-bs-toggle="tooltip" for="__primary" title="Toggle primary sidebar">
+    <button class="sidebar-toggle primary-toggle btn btn-sm" data-bs-placement="bottom" data-bs-toggle="tooltip" title="Toggle primary sidebar">
      <span class="fa-solid fa-bars">
      </span>
-    </label>
+    </button>
    </div>
   </div>
   <div class="header-article-items__end">

From 0b7850b2ec4013461462b5e83607e753e68e2c0f Mon Sep 17 00:00:00 2001
From: Angus Hollands <goosey15@gmail.com>
Date: Wed, 12 Jun 2024 13:25:37 +0100
Subject: [PATCH 2/5] maint: disable codecov uploader

---
 .github/workflows/tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9c60749e..86afdd94 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -63,8 +63,9 @@ jobs:
         pytest --durations=10 --cov=sphinx_book_theme --cov-report=xml --cov-report=term-missing
 
     # Only upload to codecov on pull requests so that we don't trigger rate limit blocks
+    # Disabled for now with false &&
     - name: Upload to Codecov
-      if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.9 && matrix.sphinx == '~=7.0' && github.repository == 'executablebooks/sphinx-book-theme' && github.event_name == 'pull_request'
+      if: false && matrix.os == 'ubuntu-latest' && matrix.python-version == 3.9 && matrix.sphinx == '~=7.0' && github.repository == 'executablebooks/sphinx-book-theme' && github.event_name == 'pull_request'
       uses: codecov/codecov-action@v3.1.4
       with:
         name: ebp-sbt-pytests-py3.7

From 764f2528f246b4fd928871ad49b773c06fa30d87 Mon Sep 17 00:00:00 2001
From: Angus Hollands <goosey15@gmail.com>
Date: Wed, 12 Jun 2024 14:13:18 +0100
Subject: [PATCH 3/5] docs: ignore linkchecking in changelog

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index c050d7d2..7eafdb88 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -187,7 +187,7 @@
     "http://someurl/release",  # This is a fake link
     "https://doi.org",  # These don't resolve properly and cause SSL issues
 ]
-
+linkcheck_exclude_documents = ["changelog"]
 
 # -- Download latest theme elements page from PyData -----------------------------
 

From 0a84a3f86801601c73cd17620dc18a6a04952b7c Mon Sep 17 00:00:00 2001
From: Angus Hollands <goosey15@gmail.com>
Date: Wed, 12 Jun 2024 14:19:21 +0100
Subject: [PATCH 4/5] ci: fix pattern

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 86afdd94..b3416f1d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -112,7 +112,7 @@ jobs:
         text = Path("./warnings.txt").read_text().strip()
         expected_warning_patterns = [r"kitchen\-sink", r"urllib/parse\.py", r"Glyph 10024 .*? missing from current font"]
         print("\n=== Sphinx Warnings ===\n\n" + text)  # Print just for reference so we can look at the logs
-        unexpected = [l for l in text.splitlines() if not any(re.search(p, ii) for p in expected_warning_patterns)]
+        unexpected = [l for l in text.splitlines() if not any(re.search(p, l) for p in expected_warning_patterns)]
         assert len(unexpected) == 0, unexpected
 
     - name: Audit with Lighthouse

From 2e53d46d402bbf819f2476daefa193900db06feb Mon Sep 17 00:00:00 2001
From: Angus Hollands <goosey15@gmail.com>
Date: Wed, 12 Jun 2024 14:30:51 +0100
Subject: [PATCH 5/5] docs: fix false-positive for nested admonitions

---
 docs/reference/special-theme-elements.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/reference/special-theme-elements.md b/docs/reference/special-theme-elements.md
index a44261bb..6c155b6f 100644
--- a/docs/reference/special-theme-elements.md
+++ b/docs/reference/special-theme-elements.md
@@ -301,8 +301,10 @@ An admonition with a sidenote defined in the admonition[^snam1] and another defi
 These aren't theme-specific, but we still show below to make sure they work.
 
 ::::{note} Here's a note!
-:::{tip} And a tip!
-:::
+
+```{tip} And a tip!
+```
+
 ::::
 
 ## MyST Markdown elements