From 95681f5bd150fb5db6418a4b5e80492a8ac56351 Mon Sep 17 00:00:00 2001
From: Jonathan Sick <jsick@lsst.org>
Date: Thu, 12 Oct 2023 19:35:50 -0400
Subject: [PATCH 1/3] Update to technote 0.3.0a7

This version changed the jinja context variable so that the metadata is
now accessed via a new metadata attribute, rather than from the "toml"
representation.
---
 pyproject.toml                                              | 2 +-
 .../templates/technote/sections/header-article.html         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 60450741..401e7cd3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -71,7 +71,7 @@ guide = [
 technote = [
     # Theme and extensions for technotes
     "sphinx<7",
-    "technote==0.3.0a6",
+    "technote==0.3.0a7",
     "sphinx-prompt",
 ]
 pipelines = [
diff --git a/src/documenteer/templates/technote/sections/header-article.html b/src/documenteer/templates/technote/sections/header-article.html
index 8bc33a86..167e9bb0 100644
--- a/src/documenteer/templates/technote/sections/header-article.html
+++ b/src/documenteer/templates/technote/sections/header-article.html
@@ -2,13 +2,13 @@
   <ol class="rubin-technote-global-breadcrumbs">
     <li><a href="https://www.lsst.io/">Rubin Documentation</a></li>
     <li>
-      <a href="https://www.lsst.io/{{technote.toml.technote.series_id|lower}}/"
-        >{{technote.toml.technote.series_id}}</a
+      <a href="https://www.lsst.io/{{technote.metadata.series_id|lower}}/"
+        >{{technote.metadata.series_id}}</a
       >
     </li>
   </ol>
 
-  <p class="technote-article-header-id">{{technote.toml.technote.id}}</p>
+  <p class="technote-article-header-id">{{technote.metadata.id}}</p>
 
   <div class="rubin-technote-version-info">
     {% if technote.version %}

From a3e45e9f4f084bac3751cfe7265c600161d9b6bd Mon Sep 17 00:00:00 2001
From: Jonathan Sick <jsick@lsst.org>
Date: Thu, 12 Oct 2023 19:49:06 -0400
Subject: [PATCH 2/3] Import Retry from urllib3

requests no longer vendors urllib3, so instead we directly depend on
urllib3 and import from it.
---
 pyproject.toml                   | 1 +
 src/documenteer/requestsutils.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 401e7cd3..2bfd10ef 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,6 +30,7 @@ dependencies = [
     "click",
     "sphinxcontrib-bibtex>=2.0.0",                  # for pybtex plugin; bibtex_bibfiles config is required.
     "pydantic >= 2.0.0",
+    "urllib3",
 ]
 
 [project.optional-dependencies]
diff --git a/src/documenteer/requestsutils.py b/src/documenteer/requestsutils.py
index 239d0930..973c66c6 100644
--- a/src/documenteer/requestsutils.py
+++ b/src/documenteer/requestsutils.py
@@ -5,7 +5,7 @@
 
 import requests
 from requests.adapters import HTTPAdapter
-from requests.packages.urllib3.util.retry import Retry
+from urllib3.util import Retry
 
 
 def requests_retry_session(

From 682538a1512520d3aedc2f8158fa7f2ffbbad29e Mon Sep 17 00:00:00 2001
From: Jonathan Sick <jsick@lsst.org>
Date: Thu, 12 Oct 2023 19:49:42 -0400
Subject: [PATCH 3/3] Update change log

---
 changelog.d/20231012_194757_jsick_DM_41179.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 changelog.d/20231012_194757_jsick_DM_41179.md

diff --git a/changelog.d/20231012_194757_jsick_DM_41179.md b/changelog.d/20231012_194757_jsick_DM_41179.md
new file mode 100644
index 00000000..95166829
--- /dev/null
+++ b/changelog.d/20231012_194757_jsick_DM_41179.md
@@ -0,0 +1,17 @@
+<!-- Delete the sections that don't apply -->
+
+### Backwards-incompatible changes
+
+-
+
+### New features
+
+-
+
+### Bug fixes
+
+- `Retry` is now imported directly from `urllib3` instead of the vendored version in requests.
+
+### Other changes
+
+- Updated to technote 0.3.0a7.