8000 Fix merge conflicts from v3.8.2-doc · matplotlib/matplotlib@3ebebc7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3ebebc7

Browse files
ksundenksunden
committed
Fix merge conflicts from v3.8.2-doc
2 parents 8fff5b1 + de210ea commit 3ebebc7

File tree

4 files changed

+41
-3
lines changed

4 files changed

+41
-3
lines changed

‎doc/_static/zenodo_cache/10150955.svg

Lines changed: 35 additions & 0 deletions
Loading

‎doc/devel/development_setup.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,8 @@ also happen if you change branches) you will have to re-run
187187

188188
If the installation is not working, please consult the :ref:`troubleshooting guide <troubleshooting-faq>`.
189189
If the guide does not offer a solution, please reach out via `chat <https://gitter.im/matplotlib/matplotlib>`_
190-
or :ref:`open an issue <submitting-a-bug-report>`. For a list of the environment
191-
variables you can set before install, see :ref:`environment-variables`.
192-
190+
or :ref:`open an issue <submitting-a-bug-report>`. For a list of environment variables
191+
you can set before install, see :ref:`environment-variables`.
193192

194193
Verify the Installation
195194
=======================

‎doc/users/project/citing.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ By version
2929
.. START OF AUTOGENERATED
3030
3131
32+
v3.8.2
33+
.. image:: ../../_static/zenodo_cache/10150955.svg
34+
:target: https://doi.org/10.5281/zenodo.10150955
3235
v3.8.1
3336
.. image:: ../../_static/zenodo_cache/10059757.svg
3437
:target: https://doi.org/10.5281/zenodo.10059757

‎tools/cache_zenodo_svg.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ def _get_xdg_cache_dir():
6363

6464
if __name__ == "__main__":
6565
data = {
66+
"v3.8.2": "10150955",
6667
"v3.8.1": "10059757",
6768
"v3.8.0": "8347255",
6869
"v3.7.3": "8336761",

0 commit comments

Comments
 (0)
0