Merge pull request matplotlib#25380 from QuLogic/merge-371

QuLogic · web-flow · commit 204ab61c9958 · 2023-03-08T01:29:18.000-05:00
Merge 3.7.1 into main
diff --git a/doc/_static/zenodo_cache/7637593.svg b/doc/_static/zenodo_cache/7637593.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="186" 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="186" height="20">
+            <rect width="186" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31v20H0z" />
+            <path fill="#007ec6"
+            d="M31 0h155v20H31z"
+            />
+            <path fill="url(#b)" d="M0 0h186v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16" y="14">
+                DOI
+            </text>
+            <text x="108"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.7637593
+            </text>
+            <text x="108" y="14">
+                10.5281/zenodo.7637593
+            </text>
+        </g>
+    </svg>
diff --git a/doc/_static/zenodo_cache/7697899.svg b/doc/_static/zenodo_cache/7697899.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="186" 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="186" height="20">
+            <rect width="186" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31v20H0z" />
+            <path fill="#007ec6"
+            d="M31 0h155v20H31z"
+            />
+            <path fill="url(#b)" d="M0 0h186v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16" y="14">
+                DOI
+            </text>
+            <text x="108"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.7697899
+            </text>
+            <text x="108" y="14">
+                10.5281/zenodo.7697899
+            </text>
+        </g>
+    </svg>
diff --git a/doc/users/github_stats.rst b/doc/users/github_stats.rst
diff --git a/doc/users/prev_whats_new/github_stats_3.7.0.rst b/doc/users/prev_whats_new/github_stats_3.7.0.rst
diff --git a/doc/users/project/citing.rst b/doc/users/project/citing.rst
@@ -29,6 +29,12 @@ By version
 .. START OF AUTOGENERATED
 
 
+v3.7.1
+   .. image:: ../../_static/zenodo_cache/7697899.svg
+      :target:  https://doi.org/10.5281/zenodo.7697899
+v3.7.0
+   .. image:: ../../_static/zenodo_cache/7637593.svg
+      :target:  https://doi.org/10.5281/zenodo.7637593
 v3.6.3
    .. image:: ../../_static/zenodo_cache/7527665.svg
       :target:  https://doi.org/10.5281/zenodo.7527665
diff --git a/doc/users/release_notes.rst b/doc/users/release_notes.rst
@@ -7,7 +7,7 @@ Release notes
 =============
 
 .. include from another document so that it's easy to exclude this for releases
-.. include:: release_notes_next.rst
+.. .. include:: release_notes_next.rst
 
 
 Version 3.7
@@ -18,6 +18,7 @@ Version 3.7
     prev_whats_new/whats_new_3.7.0.rst
     ../api/prev_api_changes/api_changes_3.7.0.rst
     github_stats.rst
+    prev_whats_new/github_stats_3.7.0.rst
 
 
 Version 3.6
diff --git a/galleries/examples/axisartist/simple_axis_direction03.py b/galleries/examples/axisartist/simple_axis_direction03.py
@@ -4,7 +4,7 @@
 ==========================================
 
 First subplot moves the tick labels to inside the spines.
-Second subplots moves the ticks to inside the spines.
+Second subplot moves the ticks to inside the spines.
 These effects can be obtained for a standard Axes by `~.Axes.tick_params`.
 """
 
diff --git a/tools/cache_zenodo_svg.py b/tools/cache_zenodo_svg.py
@@ -63,6 +63,8 @@ def _get_xdg_cache_dir():
 
 if __name__ == "__main__":
     data = {
+        "v3.7.1": "7697899",
+        "v3.7.0": "7637593",
         "v3.6.3": "7527665",
         "v3.6.2": "7275322",
         "v3.6.1": "7162185",
