pull incoming changes and solve conflict

Author: patel-zeel

.appveyor.yml

@@ -70,7 +70,7 @@ install:
 test_script:
   # Now build the thing..
   - set LINK=/LIBPATH:%cd%\lib
-  - pip install -ve .
+  - pip install -v --no-build-isolation --config-settings=setup-args="--vsenv" --editable .[dev]
   # this should show no freetype dll...
   - set "DUMPBIN=%VS140COMNTOOLS%\..\..\VC\bin\dumpbin.exe"
   - '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
@@ -94,7 +94,7 @@ artifacts:
 
 on_finish:
   - conda install codecov
-  - codecov -e PYTHON_VERSION PLATFORM
+  - codecov -e PYTHON_VERSION PLATFORM -n "$PYTHON_VERSION Windows"
 
 on_failure:
   # Generate a html for visual tests

.circleci/config.yml

@@ -1,6 +1,6 @@
 # Circle CI configuration file
 # https://circleci.com/docs/
-
+---
 version: 2.1
 
 
@@ -42,39 +42,40 @@ commands:
       - run:
           name: Install apt packages
           command: |
-            sudo apt -qq update
-            sudo apt install -y \
-              inkscape \
-              ffmpeg \
+            sudo apt-get -qq update
+            sudo apt-get install -yy --no-install-recommends \
+              cm-super \
               dvipng \
+              ffmpeg \
+              fonts-crosextra-carlito \
+              fonts-freefont-otf \
+              fonts-noto-cjk \
+              fonts-wqy-zenhei \
+              graphviz \
+              inkscape \
               lmodern \
-              cm-super \
+              ninja-build \
+              optipng \
+              texlive-fonts-recommended \
               texlive-latex-base \
               texlive-latex-extra \
-              texlive-fonts-recommended \
               texlive-latex-recommended \
               texlive-pictures \
-              texlive-xetex \
-              ttf-wqy-zenhei \
-              graphviz \
-              fonts-crosextra-carlito \
-              fonts-freefont-otf \
-              fonts-humor-sans \
-              fonts-noto-cjk \
-              optipng
+              texlive-xetex
 
   fonts-install:
     steps:
       - restore_cache:
-          key: fonts-2
+          key: fonts-4
       - run:
           name: Install custom fonts
           command: |
             mkdir -p ~/.local/share/fonts
             wget -nc https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true -O ~/.local/share/fonts/Felipa-Regular.ttf || true
+            wget -nc https://github.com/ipython/xkcd-font/blob/master/xkcd-script/font/xkcd-script.ttf?raw=true -O ~/.local/share/fonts/xkcd-Script.ttf || true
             fc-cache -f -v
       - save_cache:
-          key: fonts-2
+          key: fonts-4
           paths:
             - ~/.local/share/fonts/
 
@@ -97,6 +98,7 @@ commands:
       - run:
           name: Install Python dependencies
           command: |
+            python -m pip install --user meson-python pybind11
             python -m pip install --user \
                 numpy<< parameters.numpy_version >> \
                 -r requirements/doc/doc-requirements.txt
@@ -114,15 +116,13 @@ commands:
               version=${version#v}
               python -m pip install matplotlib==${version}
             else
-              python -m pip install --user -ve .
+              python -m pip install --user --verbose \
+                --no-build-isolation --editable .[dev]
             fi
       - save_cache:
-          key: build-deps-1
+          key: build-deps-2
           paths:
-            # FreeType 2.6.1 tarball.
-            - ~/.cache/matplotlib/0a3c7dfbda6da1e8fce29232e8e96d987ababbbf71ebc8c75659e4132c367014
-            # Qhull 2020.2 tarball.
-            - ~/.cache/matplotlib/b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e
+            - subprojects/packagecache
 
   doc-build:
     steps:
@@ -199,6 +199,12 @@ commands:
       - store_artifacts:
           path: doc/build/sphinx-gallery-files.tar.gz
 
+  deploy-docs:
+    steps:
+      - run:
+          name: "Deploy new docs"
+          command: ./.circleci/deploy-docs.sh
+
 
 ##########################################
 # Here is where the real jobs are defined.
@@ -218,8 +224,8 @@ jobs:
       - fonts-install
       - pip-install
 
-      - mpl-install
       - doc-deps-install
+      - mpl-install
 
       - doc-build
       - doc-show-errors-warnings
@@ -236,9 +242,7 @@ jobs:
           fingerprints:
             - "be:c3:c1:d8:fb:a1:0e:37:71:72:d7:a3:40:13:8f:14"
 
-      - deploy:
-          name: "Deploy new docs"
-          command: ./.circleci/deploy-docs.sh
+      - deploy-docs
 
 #########################################
 # Defining workflows gets us parallelism.

.devcontainer/devcontainer.json

@@ -0,0 +1,38 @@
+{
+  "hostRequirements": {
+    "memory": "8gb",
+    "cpus": 4
+  },
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "features": {
+    "ghcr.io/devcontainers/features/desktop-lite:1": {},
+    "ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
+      "packages": "inkscape,ffmpeg,dvipng,lmodern,cm-super,texlive-latex-base,texlive-latex-extra,texlive-fonts-recommended,texlive-latex-recommended,texlive-pictures,texlive-xetex,fonts-wqy-zenhei,graphviz,fonts-crosextra-carlito,fonts-freefont-otf,fonts-comic-neue,fonts-noto-cjk,optipng"
+    }
+  },
+  "onCreateCommand": ".devcontainer/setup.sh",
+  "postCreateCommand": "",
+  "forwardPorts": [6080],
+  "portsAttributes": {
+    "6080": {
+      "label": "desktop"
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-python.python",
+        "yy0931.mplstyle",
+        "eamodio.gitlens",
+        "ms-vscode.live-server"
+      ],
+      "settings": {}
+    },
+    "codespaces": {
+      "openFiles": [
+        "README.md",
+        "doc/devel/codespaces.md"
+      ]
+    }
+  }
+}

.devcontainer/setup.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+"${SHELL}" <(curl -Ls micro.mamba.pm/install.sh) < /dev/null
+
+conda init --all
+micromamba shell init -s bash
+micromamba env create -f environment.yml --yes
+# Note that `micromamba activate mpl-dev` doesn't work, it must be run by the
+# user (same applies to `conda activate`)
+echo "envs_dirs:
+  - /home/codespace/micromamba/envs" > /opt/conda/.condarc

.flake8

@@ -31,28 +31,18 @@ exclude =
     .eggs
 
 per-file-ignores =
-    setup.py: E402
-
-    lib/matplotlib/__init__.py: E402, F401
-    lib/matplotlib/_animation_data.py: E501
-    lib/matplotlib/_api/__init__.py: F401
-    lib/matplotlib/_cm.py: E122, E202, E203, E302
+    lib/matplotlib/_cm.py: E202, E203, E302
     lib/matplotlib/_mathtext.py: E221, E251
-    lib/matplotlib/_mathtext_data.py: E122, E203, E261
-    lib/matplotlib/axes/__init__.py: F401, F403
+    lib/matplotlib/_mathtext_data.py: E203, E261
     lib/matplotlib/backends/backend_template.py: F401
-    lib/matplotlib/font_manager.py: E501
-    lib/matplotlib/image.py: F401, F403
     lib/matplotlib/mathtext.py: E221
     lib/matplotlib/pylab.py: F401, F403
-    lib/matplotlib/pyplot.py: F401, F811
+    lib/matplotlib/pyplot.py: F811
     lib/matplotlib/tests/test_mathtext.py: E501
     lib/matplotlib/transforms.py: E201, E202, E203
     lib/matplotlib/tri/_triinterpolate.py: E201, E221
     lib/mpl_toolkits/axes_grid1/axes_size.py: E272
-    lib/mpl_toolkits/axisartist/__init__.py: F401
     lib/mpl_toolkits/axisartist/angle_helper.py: E221
-    lib/pylab.py: F401, F403
 
     doc/conf.py: E402
     galleries/users_explain/artists/paths.py: E402

.github/ISSUE_TEMPLATE/tag_proposal.yml

@@ -0,0 +1,27 @@
+name: Tag Proposal
+description: Suggest a new tag or subcategory for the gallery of examples
+title: "[Tag]: "
+labels: [Tag proposal]
+body:
+  - type: markdown
+    attributes:
+      value: |
+         Please search the [tag glossary]() for relevant tags before creating a new tag proposal.
+  - type: textarea
+    id: need
+    attributes:
+      label: Need
+      description: Briefly describe the need this tag will fill. (1-4 sentences)
+      placeholder: |
+        * A tag is needed for examples that share [...]
+        * Existing tags do not work because [...]
+        * Current gallery examples that would use this tag include [...]
+        * Indicate which subcategory this tag falls under, or whether a new subcategory is proposed.
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Proposed solution
+      description: >
+        What should the tag be? All tags are in the format `subcategory: tag`

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,40 +1,30 @@
+<!--
+Thank you so much for your PR!  To help us review your contribution, please check
+out the development guide https://matplotlib.org/devdocs/devel/index.html
+-->
+
 ## PR summary
+<!-- Please provide at least 1-2 sentences describing the pull request in detail
+(Why is this change required?  What problem does it solve?) and link to relevant
+issues and PRs.
+
+Also please summarize the changes in the title, for example "Raise ValueError on
+non-numeric input to set_xlim" and avoid non-descriptive titles such as "Addresses
+issue #8576".
+-->
+
 
 ## PR checklist
 <!-- Please mark any checkboxes that do not apply to this PR as [N/A].-->
 
 - [ ] "closes #0000" is in the body of the PR description to [link the related issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
 - [ ] new and changed code is [tested](https://matplotlib.org/devdocs/devel/testing.html)
-- [ ] *Plotting related* features are demonstrated in an [example](https://matplotlib.org/devdocs/devel/documenting_mpl.html#writing-examples-and-tutorials)
-- [ ] *New Features* and *API Changes* are noted with a [directive and release note](https://matplotlib.org/devdocs/devel/coding_guide.html#new-features-and-api-changes)
-- [ ] Documentation complies with [general](https://matplotlib.org/devdocs/devel/documenting_mpl.html#writing-rest-pages) and [docstring](https://matplotlib.org/devdocs/devel/documenting_mpl.html#writing-docstrings) guidelines
-
-<!--
-Thank you so much for your PR!  To help us review your contribution, please
-consider the following points:
+- [ ] *Plotting related* features are demonstrated in an [example](https://matplotlib.org/devdocs/devel/document.html#write-examples-and-tutorials)
+- [ ] *New Features* and *API Changes* are noted with a [directive and release note](https://matplotlib.org/devdocs/devel/api_changes.html#announce-changes-deprecations-and-new-features)
+- [ ] Documentation complies with [general](https://matplotlib.org/devdocs/devel/document.html#write-rest-pages) and [docstring](https://matplotlib.org/devdocs/devel/document.html#write-docstrings) guidelines
 
-- A development guide is available at https://matplotlib.org/devdocs/devel/index.html.
-
-- Help with git and github is available at https://matplotlib.org/devdocs/devel/development_workflow.html
-
-- Create a separate branch for your changes and open the PR from this branch. Please avoid working on `main`.
-
-- The PR title should summarize the changes, for example "Raise ValueError on
-  non-numeric input to set_xlim".  Avoid non-descriptive titles such as
-  "Addresses issue #8576".
-
-- The summary should provide at least 1-2 sentences describing the pull request
-  in detail (Why is this change required?  What problem does it solve?) and
-  link to any relevant issues.
-
-- If you are contributing fixes to docstrings, please pay attention to
-  https://matplotlib.org/stable/devel/documenting_mpl.html#formatting-conventions.  In particular,
-  note the difference between using single backquotes, double backquotes, and
-  asterisks in the markup.
-
-We understand that PRs can sometimes be overwhelming, especially as the
+<!--We understand that PRs can sometimes be overwhelming, especially as the
 reviews start coming in.  Please let us know if the reviews are unclear or
 the recommended next step seems overly demanding, if you would like help in
 addressing a reviewer's comments, or if you have been waiting too long to hear
-back on your PR.
--->
+back on your PR.-->

.github/dependabot.yml

@@ -4,3 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    groups:
+      actions:
+        patterns:
+          - "*"