Merge pull request #23225 from melissawm/fix-switcher

timhoffm · web-flow · commit 0ebff5006cc8 · 2022-06-09T12:58:29.000+02:00
DOC: Fix version switcher links to documentation
diff --git a/doc/_static/switcher.json b/doc/_static/switcher.json
@@ -1,22 +1,27 @@
 [
     {
         "name": "3.5 (stable)",
-        "version": "stable"
+        "version": "stable",
+        "url": "https://matplotlib.org/stable"
     },
     {
         "name": "3.6 (dev)",
-        "version": "devdocs"
+        "version": "devdocs",
+        "url": "https://matplotlib.org/devdocs"
     },
     {
         "name": "3.4",
-        "version": "3.4.3"
+        "version": "3.4.3",
+        "url": "https://matplotlib.org/3.4.3"
     },
     {
         "name": "3.3",
-        "version": "3.3.4"
+        "version": "3.3.4",
+        "url": "https://matplotlib.org/3.3.4"
     },
     {
         "name": "2.2",
-        "version": "2.2.4"
+        "version": "2.2.4",
+        "url": "https://matplotlib.org/2.2.4"
     }
 ]
diff --git a/doc/conf.py b/doc/conf.py
@@ -329,14 +329,13 @@ def matplotlib_reduced_latex_scraper(block, block_vars, gallery_conf,
 html_logo = "_static/logo2.svg"
 html_theme_options = {
     "native_site": True,
-    "logo_link": "index",
+    "logo": {"link": "index"},
     # collapse_navigation in pydata-sphinx-theme is slow, so skipped for local
     # and CI builds https://github.com/pydata/pydata-sphinx-theme/pull/386
     "collapse_navigation": not is_release_build,
     "show_prev_next": False,
     "switcher": {
         "json_url": "https://matplotlib.org/devdocs/_static/switcher.json",
-        "url_template": "https://matplotlib.org/{version}/",
         "version_match": (
             # The start version to show. This must be in switcher.json.
             # We either go to 'stable' or to 'devdocs'
diff --git a/requirements/doc/doc-requirements.txt b/requirements/doc/doc-requirements.txt
@@ -13,7 +13,7 @@ ipython
 ipywidgets
 numpydoc>=1.0
 packaging>=20
-pydata-sphinx-theme>=0.8.0
+pydata-sphinx-theme>=0.9.0
 mpl-sphinx-theme
 sphinxcontrib-svg2pdfconverter>=1.1.0
 sphinx-gallery>=0.10

Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,27 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"name": "3.5 (stable)",`
`4`		`- "version": "stable"`
	`4`	`+ "version": "stable",`
	`5`	`+ "url": "https://matplotlib.org/stable"`
`5`	`6`	`},`
`6`	`7`	`{`
`7`	`8`	`"name": "3.6 (dev)",`
`8`		`- "version": "devdocs"`
	`9`	`+ "version": "devdocs",`
	`10`	`+ "url": "https://matplotlib.org/devdocs"`
`9`	`11`	`},`
`10`	`12`	`{`
`11`	`13`	`"name": "3.4",`
`12`		`- "version": "3.4.3"`
	`14`	`+ "version": "3.4.3",`
	`15`	`+ "url": "https://matplotlib.org/3.4.3"`
`13`	`16`	`},`
`14`	`17`	`{`
`15`	`18`	`"name": "3.3",`
`16`		`- "version": "3.3.4"`
	`19`	`+ "version": "3.3.4",`
	`20`	`+ "url": "https://matplotlib.org/3.3.4"`
`17`	`21`	`},`
`18`	`22`	`{`
`19`	`23`	`"name": "2.2",`
`20`		`- "version": "2.2.4"`
	`24`	`+ "version": "2.2.4",`
	`25`	`+ "url": "https://matplotlib.org/2.2.4"`
`21`	`26`	`}`
`22`	`27`	`]`