Merge branch 'main' into add-3.12

wpilibsuite · Dec 14, 2023 · 7d5d08c · 7d5d08c
2 parents 90355f1 + 641c59e
commit 7d5d08c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -69,7 +69,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['pypy3.9', '3.8', '3.9', '3.10', '3.11', '3.12']
-        sphinx-version: ['>=4,<5', '>=5,<6', '>=6a0,<7']
+        sphinx-version: ['>=4,<5', '>=5,<6', '>=6a0,<7', '>=7,<8']
         os: [windows-latest, macos-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v4

diff --git a/sphinxext/opengraph/socialcards.py b/sphinxext/opengraph/socialcards.py
@@ -183,11 +183,11 @@ def create_social_card_objects(
     """Create the Matplotlib objects for the first time."""
     # If no font specified, load the Roboto Flex font as a fallback
     if font is None:
-        path_font = Path(__file__).parent / "_static/Roboto-flex.ttf"
+        path_font = Path(__file__).parent / "_static/Roboto-Flex.ttf"
         roboto_font = matplotlib.font_manager.FontEntry(
-            fname=str(path_font), name="Roboto"
+            fname=str(path_font), name="Roboto Flex"
         )
-        matplotlib.font_manager.fontManager.ttflist.append(roboto_font)
+        matplotlib.font_manager.fontManager.addfont(path_font)
         font = roboto_font.name
 
     # Because Matplotlib doesn't let you specify figures in pixels, only inches