Merge branch 'main' into repr-html-fonts

Author: ambi7

.flake8

@@ -94,14 +94,13 @@ per-file-ignores =
     tutorials/colors/colormap-manipulation.py: E402
     tutorials/intermediate/artists.py: E402
     tutorials/intermediate/constrainedlayout_guide.py: E402
-    tutorials/intermediate/gridspec.py: E402
     tutorials/intermediate/legend_guide.py: E402
     tutorials/intermediate/tight_layout_guide.py: E402
     tutorials/introductory/customizing.py: E501
     tutorials/introductory/images.py: E402, E501
     tutorials/introductory/pyplot.py: E402, E501
     tutorials/introductory/sample_plots.py: E501
-    tutorials/introductory/usage.py: E501
+    tutorials/introductory/usage.py: E703
     tutorials/text/annotations.py: E402, E501
     tutorials/text/text_intro.py: E402
     tutorials/text/text_props.py: E501
@@ -121,6 +120,7 @@ per-file-ignores =
     examples/subplots_axes_and_figures/demo_constrained_layout.py: E402
     examples/text_labels_and_annotations/custom_legends.py: E402
     examples/ticks/date_concise_formatter.py: E402
+    examples/ticks/date_formatters_locators.py: F401
     examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py: E402
     examples/user_interfaces/embedding_in_gtk3_sgskip.py: E402
     examples/user_interfaces/embedding_in_gtk4_panzoom_sgskip.py: E402

.gitattributes

@@ -1,4 +1,5 @@
 * text=auto
+*.m diff=objc
 *.ppm binary
 *.svg binary
 *.svg linguist-language=true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,16 +1,12 @@
 name: Bug Report
-description: Report a bug or issue with Matplotlib
+description: Report a bug or issue with Matplotlib.
 title: "[Bug]: "
 body:
-  - type: markdown
-    attributes:
-      value: |
-        To help us understand and resolve your issue, please fill out the form to the best of your ability. 
   - type: textarea
     id: summary
     attributes:
       label: Bug summary
-      description: Please provide 1-2 short sentences that succinctly describes the bug
+      description:  Describe the bug in 1-2 short sentences 
       placeholder: 
       value:
     validations:
@@ -28,63 +24,62 @@ body:
     id: actual
     attributes:
       label: Actual outcome
-      description: Please provide the output produced by the above code, which may be a screenshot, console output, etc. 
-      placeholder: if applicable, paste the console output and images here
+      description: |
+        Paste the output produced by the code provided above, e.g.
+        console output, images/videos produced by the code, any relevant screenshots/screencasts, etc.
     validations:
       required: true
   - type: textarea
     id: expected
     attributes:
       label: Expected outcome
-      description: Please provide a description (or visual example) of the expected outcome from the code snippet. If this used to work in an earlier version of Matplotlib, please note the version it used to work on
+      description: Describe (or provide a visual example of) the expected outcome from the code snippet.
     validations:
       required: true
+  - type: textarea
+    id: details
+    attributes:
+      label: Additional information
+      description: |
+        - What are the conditions under which this bug happens? input parameters, edge cases, etc?
+        - Has this worked in earlier versions?
+        - Do you know why this bug is happening?
+        - Do you maybe even know a fix?
   - type: input
     id: operating-system
     attributes:
       label: Operating system
-      description: What operating system are you using?
-      placeholder: Windows, OS/X, Arch, Debian, Ubuntu, etc.  
+      description: Windows, OS/X, Arch, Debian, Ubuntu, etc.
   - type: input
     id: matplotlib-version
     attributes:
       label: Matplotlib Version
-      placeholder: import matplotlib; print(matplotlib.__version__)
+      description: "From Python prompt: `import matplotlib; print(matplotlib.__version__)`"
     validations:
       required: true
   - type: input
     id: matplotlib-backend
     attributes: 
       label: Matplotlib Backend
-      placeholder: print(matplotlib.get_backend())
+      description: "From Python prompt: `import matplotlib; print(matplotlib.get_backend())`"
   - type: input
     id: python-version
     attributes:
       label: Python version
-      placeholder: python --version
+      description: "In console: `python --version`"
   - type: input
     id: jupyter-version
     attributes:
       label: Jupyter version
-      placeholder: jupyter notebook --version, jupyter lab --version
-  - type: textarea
-    id: other-libraries
-    attributes:
-      label: Other libraries
-      description: please provide the versions of any other libraries that are relevant to this bug report.
+      description: "In console: `jupyter notebook --version` or `jupyter lab --version`"
   - type: dropdown
     id: install
     attributes:
       label: Installation
-      description: how did you install matplotlib?
+      description: How did you install matplotlib?
       options:
         - pip
         - conda
-        - Linux package manager (Debian/Fedora/etc.)
-        - source
-  - type: input
-    id: conda-channel
-    attributes:
-      label: Conda channel
-      description: If you installed from conda, please specify which channel you used if not the default?
-      placeholder: conda-forge
+        - Linux package manager
+        - from source (.tar.gz)
+        - git checkout

.github/ISSUE_TEMPLATE/documentation.yml

@@ -3,16 +3,14 @@ description: Create a report to help us improve the documentation
 title: "[Doc]: "
 labels: [Documentation]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        To help us understand and resolve your issue, please fill out the form to the best of your ability.
   - type: input
     id: link
     attributes:
       label: Documentation Link
-      description: Please provide a link to any documentation or examples that you are referencing.  
-      placeholder: https://matplotlib.org/devdocs/
+      description: |
+        Link to any documentation or examples that you are referencing.
+        Suggested improvements should be based on the development version of the docs: https://matplotlib.org/devdocs/
+      placeholder: https://matplotlib.org/devdocs/...
   - type: textarea
     id: problem
     attributes:
@@ -28,7 +26,6 @@ body:
     id: improvement
     attributes:
       label: Suggested improvement
-      description: How can we improve the documentation?
       placeholder: |
         * This line should be be changed to say [...]
         * Include a paragraph explaining [...]
@@ -37,15 +34,6 @@ body:
     id: matplotlib-version
     attributes:
       label: Matplotlib Version
-      placeholder: import matplotlib; print(matplotlib.__version__)
-    validations:
-      required: true
-  - type: input
-    id: matplotlib-doc-version
-    attributes:
-      label: Matplotlib documentation version
-      placeholder: check under the logo
+      description: "From Python prompt: `import matplotlib; print(matplotlib.__version__)`"
     validations:
       required: true
-
-  

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -6,12 +6,12 @@ body:
   - type: markdown
     attributes:
       value: |
-         Thanks for thinking of a way to improve Matplotlib. Please search the issues for relevant feature requests before creating a new feature request.  
+         Please search the [issues](https://github.com/matplotlib/matplotlib/issues) for relevant feature requests before creating a new feature request.
   - type: textarea
     id: problem
     attributes:
       label: Problem
-      description: Please provide a clear and concise description of the problem this feature will solve. 
+      description: Briefly describe the problem this feature will solve. (2-4 sentences)
       placeholder: |
         * I'm always frustrated when [...] because [...]
         * I would like it if [...] happened when I [...] because [...]
@@ -22,15 +22,4 @@ body:
     id: solution
     attributes:
       label: Proposed solution
-      description: Please provide a clear and concise description of a way to accomplish what you want.
-      placeholder: Add an option so that when [...]  [...] will happen
-  - type: textarea
-    id: prior-art
-    attributes:
-      label: Additional context and prior art
-      description: Add any other context or screenshots about the feature request here. You can also include links to examples of other programs that have something similar to your request.
-      placeholder: Another project [...] solved this by [...]
-
-
-
-
+      description: Describe a way to accomplish the goals of this feature request.

.github/workflows/clean_pr.yml

@@ -19,4 +19,14 @@ jobs:
             printf 'The following files were both added and deleted in this PR:\n%s\n' "$ad"
             exit 1
           fi
-
+      - name: Check for added-and-modified images
+        run: |
+          git fetch --quiet origin "$GITHUB_BASE_REF"
+          base="$(git merge-base "origin/$GITHUB_BASE_REF" 'HEAD^2')"
+          am="$(git log "$base..HEAD^2" --pretty=tformat: --name-status --diff-filter=AM |
+                cut --fields 2 | sort | uniq --repeated |
+                grep -E '\.(png|pdf|ps|eps|svg)' || true)"
+          if [[ -n "$am" ]]; then
+            printf 'The following images were both added and modified in this PR:\n%s\n' "$am"
+            exit 1
+          fi

.github/workflows/tests.yml

@@ -14,6 +14,7 @@ env:
 
 jobs:
   test:
+    if: "github.repository == 'matplotlib/matplotlib' && !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip github]')"
     name: "Python ${{ matrix.python-version }} on ${{ matrix.os }} ${{ matrix.name-suffix }}"
     runs-on: ${{ matrix.os }}
 
@@ -225,9 +226,16 @@ jobs:
             fi
           fi
 
+          cat <<EOT >> mplsetup.cfg
+          [rc_options]
+          backend=Agg
+          EOT
+
+          cat mplsetup.cfg
+
           # All dependencies must have been pre-installed, so that the minver
           # constraints are held.
-          python -m pip install --no-deps -e .
+          python -m pip install --no-deps -ve .
 
           if [[ "${{ runner.os }}" != 'macOS' ]]; then
             unset CPPFLAGS
@@ -242,7 +250,7 @@ jobs:
         run: |
           ${{ matrix.XVFB_RUN }} python -mpytest -raR -n auto \
             --maxfail=50 --timeout=300 --durations=25 \
-            --cov-report=xml --cov=lib --log-level=DEBUG
+            --cov-report=xml --cov=lib --log-level=DEBUG --color=yes
 
       - name: Filter C coverage
         run: |

INSTALL.rst

@@ -1,91 +1 @@
-############
-Installation
-############
-
-==============================
-Installing an official release
-==============================
-
-Matplotlib releases are available as wheel packages for macOS, Windows and
-Linux on `PyPI <https://pypi.org/project/matplotlib/>`_. Install it using
-``pip``:
-
-.. code-block:: sh
-
-  python -m pip install -U pip
-  python -m pip install -U matplotlib
-
-If this command results in Matplotlib being compiled from source and
-there's trouble with the compilation, you can add ``--prefer-binary`` to
-select the newest version of Matplotlib for which there is a
-precompiled wheel for your OS and Python.
-
-.. note::
-
-   The following backends work out of the box: Agg, ps, pdf, svg
-
-   Python is typically shipped with tk bindings which are used by
-   TkAgg.
-
-   For support of other GUI frameworks, LaTeX rendering, saving
-   animations and a larger selection of file formats, you can
-   install :ref:`optional_dependencies`.
-
-=========================
-Third-party distributions
-=========================
-
-Various third-parties provide Matplotlib for their environments.
-
-Conda packages
-==============
-Matplotlib is available both via the *anaconda main channel*
-
-.. code-block:: sh
-
-   conda install matplotlib
-
-as well as via the *conda-forge community channel*
-
-.. code-block:: sh
-
-   conda install -c conda-forge matplotlib
-
-Python distributions
-====================
-
-Matplotlib is part of major Python distributions:
-
-- `Anaconda <https://www.anaconda.com/>`_
-
-- `ActiveState ActivePython
-  <https://www.activestate.com/products/python/downloads/>`_
-
-- `WinPython <https://winpython.github.io/>`_
-
-Linux package manager
-=====================
-
-If you are using the Python version that comes with your Linux distribution,
-you can install Matplotlib via your package manager, e.g.:
-
-* Debian / Ubuntu: ``sudo apt-get install python3-matplotlib``
-* Fedora: ``sudo dnf install python3-matplotlib``
-* Red Hat: ``sudo yum install python3-matplotlib``
-* Arch: ``sudo pacman -S python-matplotlib``
-
-======================
-Installing from source
-======================
-See :ref:`install_from_source`.
-
-==========================
-Installing for development
-==========================
-See :ref:`installing_for_devs`.
-
-==============
-Installing FAQ
-==============
-
-See :ref:`installing-faq`.
+See doc/users/installing/index.rst

README.rst

@@ -58,8 +58,9 @@ various graphical user interface toolkits.
 Install
 =======
 
-For installation instructions and requirements, see `INSTALL.rst <INSTALL.rst>`_  or the
-`install <https://matplotlib.org/stable/users/installing.html>`_ documentation.
+For installation instructions and requirements, see the `install documentation
+<https://matplotlib.org/stable/users/installing/index.html>`_ or
+`installing.rst <doc/users/installing/index.rst>`_ in the source.
 
 Contribute
 ==========
@@ -98,7 +99,7 @@ Citing Matplotlib
 If Matplotlib contributes to a project that leads to publication, please
 acknowledge this by citing Matplotlib.
 
-`A ready-made citation entry <https://matplotlib.org/stable/citing.html>`_ is
+`A ready-made citation entry <https://matplotlib.org/stable/users/project/citing.html>`_ is
 available.
 
 Research notice