Fix merge conflicts from v3.8.2-doc

ksunden · ksunden · commit 3ebebc76cf05 · 2024-02-14T17:32:01.000-06:00
diff --git a/doc/_static/zenodo_cache/10150955.svg b/doc/_static/zenodo_cache/10150955.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="190.859375" height="20">
+        <linearGradient id="b" x2="0" y2="100%">
+            <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+            <stop offset="1" stop-opacity=".1"/>
+        </linearGradient>
+        <mask id="a" width="190.859375" height="20">
+            <rect width="190.859375" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31.375v20H0z" />
+            <path fill="#007ec6"
+            d="M31.375 0h159.484375v20H31.375z"
+            />
+            <path fill="url(#b)" d="M0 0h190.859375v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16.1875" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16.1875" y="14">
+                DOI
+            </text>
+            <text x="110.6171875"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.10150955
+            </text>
+            <text x="110.6171875" y="14">
+                10.5281/zenodo.10150955
+            </text>
+        </g>
+    </svg>
diff --git a/doc/devel/development_setup.rst b/doc/devel/development_setup.rst
@@ -187,9 +187,8 @@ also happen if you change branches) you will have to re-run
 
 If the installation is not working, please consult the :ref:`troubleshooting guide <troubleshooting-faq>`.
 If the guide does not offer a solution, please reach out via `chat <https://gitter.im/matplotlib/matplotlib>`_
-or :ref:`open an issue <submitting-a-bug-report>`. For a list of the environment
-variables you can set before install, see :ref:`environment-variables`.
-
+or :ref:`open an issue <submitting-a-bug-report>`. For a list of environment variables
+you can set before install, see :ref:`environment-variables`.
 
 Verify the Installation
 =======================
diff --git a/doc/users/project/citing.rst b/doc/users/project/citing.rst
@@ -29,6 +29,9 @@ By version
 .. START OF AUTOGENERATED
 
 
+v3.8.2
+   .. image:: ../../_static/zenodo_cache/10150955.svg
+      :target:  https://doi.org/10.5281/zenodo.10150955
 v3.8.1
    .. image:: ../../_static/zenodo_cache/10059757.svg
       :target:  https://doi.org/10.5281/zenodo.10059757
diff --git a/tools/cache_zenodo_svg.py b/tools/cache_zenodo_svg.py
@@ -63,6 +63,7 @@ def _get_xdg_cache_dir():
 
 if __name__ == "__main__":
     data = {
+        "v3.8.2": "10150955",
         "v3.8.1": "10059757",
         "v3.8.0": "8347255",
         "v3.7.3": "8336761",
