Merge branch 'matplotlib:main' into fix_QuadMesh_cursor_data

Author: raphaelquast

.appveyor.yml

@@ -21,15 +21,12 @@ environment:
     PINNEDVERS: "pyzmq!=21.0.0,!=22.0.0"
 
   matrix:
-    # In theory we could use a single CONDA_INSTALL_LOCN because we construct
-    # the envs anyway. But using one for the right python version hopefully
-    # making things faster due to package caching.
-    - PYTHON_VERSION: "3.7"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
+    - PYTHON_VERSION: "3.8"
+      CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
       TEST_ALL: "no"
       EXTRAREQS: "-r requirements/testing/extra.txt"
-    - PYTHON_VERSION: "3.8"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
+    - PYTHON_VERSION: "3.9"
+      CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
       TEST_ALL: "no"
       EXTRAREQS: "-r requirements/testing/extra.txt"
 

.flake8

@@ -42,7 +42,6 @@ exclude =
 
 per-file-ignores =
     setup.py: E402
-    setupext.py: E501
     tests.py: F401
 
     lib/matplotlib/__init__.py: E402, F401

.git-blame-ignore-revs

@@ -0,0 +1,8 @@
+# style: end-of-file-fixer pre-commit hook
+c1a33a481b9c2df605bcb9bef9c19fe65c3dac21
+
+# style: trailing-whitespace pre-commit hook
+213061c0804530d04bbbd5c259f10dc8504e5b2b
+
+# style: check-docstring-first pre-commit hook
+046533797725293dfc2a6edb9f536b25f08aa636

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,16 +6,16 @@ body:
     id: summary
     attributes:
       label: Bug summary
-      description:  Describe the bug in 1-2 short sentences 
-      placeholder: 
+      description:  Describe the bug in 1-2 short sentences
+      placeholder:
       value:
     validations:
       required: true
   - type: textarea
     id: reproduction
     attributes:
       label: Code for reproduction
-      description: If possible, please provide a minimum self-contained example. 
+      description: If possible, please provide a minimum self-contained example.
       placeholder: Paste your code here
       render: python
     validations:
@@ -59,7 +59,7 @@ body:
       required: true
   - type: input
     id: matplotlib-backend
-    attributes: 
+    attributes:
       label: Matplotlib Backend
       description: "From Python prompt: `import matplotlib; print(matplotlib.get_backend())`"
   - type: input

.github/ISSUE_TEMPLATE/documentation.yml

@@ -15,7 +15,7 @@ body:
     id: problem
     attributes:
       label: Problem
-      description: What is missing, unclear, or wrong in the documentation? 
+      description: What is missing, unclear, or wrong in the documentation?
       placeholder: |
         * I found [...] to be unclear because [...]
         * [...] made me think that [...] when really it should be [...]

.github/ISSUE_TEMPLATE/maintenance.yml

@@ -7,11 +7,11 @@ body:
     id: summary
     attributes:
       label: Summary
-      description:  Please provide 1-2 short sentences that succinctly describes what could be improved. 
+      description:  Please provide 1-2 short sentences that succinctly describes what could be improved.
     validations:
       required: true
   - type: textarea
     id: fix
     attributes:
       label: Proposed fix
-      description: Please describe how you think this could be improved.  
+      description: Please describe how you think this could be improved.

.github/workflows/cibuildwheel.yml

@@ -20,17 +20,19 @@ on:
 jobs:
   build_wheels:
     if: |
-      (
-        github.event.action == 'labeled' &&
-        github.event.label.name == 'Run cibuildwheel'
-      ) ||
-      contains(github.event.pull_request.labels.*.name, 'Run cibuildwheel')
+      github.event_name == 'push' ||
+      github.event_name == 'pull_request' && (
+        (
+          github.event.action == 'labeled' &&
+          github.event.label.name == 'Run cibuildwheel'
+        ) ||
+        contains(github.event.pull_request.labels.*.name, 'Run cibuildwheel')
+      )
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
-      min-numpy-version: "1.17.3"
-      min-numpy-hash: "b6/d6/be8f975f5322336f62371c9abeb936d592c98c047ad63035f1b38ae08efe"
       CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
+      MACOSX_DEPLOYMENT_TARGET: "10.12"
     strategy:
       matrix:
         os: [ubuntu-18.04, windows-latest, macos-10.15]
@@ -46,44 +48,27 @@ jobs:
         with:
           platforms: arm64
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         name: Install Python
         with:
-          python-version: '3.7'
-
-      - uses: actions/cache@v2
-        id: numpy-cache
-        with:
-          path: numpy-aarch64-cache/
-          key: numpy-${{ matrix.cibw_archs }}-cache-${{ env.min-numpy-version }}
+          python-version: '3.8'
 
       - name: Install cibuildwheel
         run: |
           python -m pip install cibuildwheel==2.1.1
 
-      - name: Build minimum NumPy for aarch64
-        if: matrix.cibw_archs == 'aarch64' && steps.numpy-cache.outputs.cache-hit != 'true'
-        run: |
-          wget https://files.pythonhosted.org/packages/${{ env.min-numpy-hash }}/numpy-${{ env.min-numpy-version }}.zip
-          unzip numpy-${{ env.min-numpy-version }}.zip
-          cd numpy-${{ env.min-numpy-version }}
-          python -m cibuildwheel --output-dir ../numpy-aarch64-cache
-        env:
-          CIBW_BUILD: "cp37-* cp38-*"
-          CIBW_ARCHS: aarch64
-
       - name: Build wheels for CPython 3.10
         run: |
           python -m cibuildwheel --output-dir dist
         env:
           CIBW_BUILD: "cp310-*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_MANYLINUX_I686_IMAGE: manylinux2014
-          CIBW_BEFORE_BUILD: pip install certifi numpy==1.21.3
+          CIBW_BEFORE_BUILD: pip install certifi oldest-supported-numpy
           MPL_DISABLE_FH4: "yes"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
@@ -94,36 +79,36 @@ jobs:
           CIBW_BUILD: "cp39-*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
           CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BEFORE_BUILD: pip install certifi numpy==1.19.3
+          CIBW_BEFORE_BUILD: pip install certifi oldest-supported-numpy
           MPL_DISABLE_FH4: "yes"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
-      - name: Build wheels for CPython
+      - name: Build wheels for CPython 3.8
         run: |
           python -m cibuildwheel --output-dir dist
         env:
-          CIBW_BUILD: "cp37-* cp38-*"
+          CIBW_BUILD: "cp38-*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
           CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BEFORE_BUILD: pip install certifi; pip install --find-links=numpy-aarch64-cache/ numpy==${{ env.min-numpy-version }}
+          CIBW_BEFORE_BUILD: pip install certifi numpy==1.19.2
           MPL_DISABLE_FH4: "yes"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for PyPy
         run: |
           python -m cibuildwheel --output-dir dist
         env:
-          CIBW_BUILD: "pp37-*"
-          CIBW_BEFORE_BUILD: pip install certifi numpy==${{ env.min-numpy-version }}
+          CIBW_BUILD: "pp38-*"
+          CIBW_BEFORE_BUILD: pip install certifi oldest-supported-numpy
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
           PIP_USE_FEATURE: in-tree-build
-        if: matrix.cibw_archs != 'aarch64'
+        if: false && matrix.cibw_archs != 'aarch64'
 
       - name: Validate that LICENSE files are included in wheels
         run: |
           python ./ci/check_wheel_licenses.py
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: ./dist/*.whl

.github/workflows/clean_pr.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: '0'
       - name: Check for added-and-deleted files

.github/workflows/nightlies.yml

@@ -0,0 +1,65 @@
+name: Upload nightly wheels to Anaconda Cloud
+
+on:
+  # Run daily at 1:23 UTC to upload nightly wheels to Anaconda Cloud
+  schedule:
+    - cron: '23 1 * * *'
+  # Run on demand with workflow dispatch
+  workflow_dispatch:
+
+jobs:
+  upload_nightly_wheels:
+    name: Upload nightly wheels to Anaconda Cloud
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'matplotlib'
+
+    steps:
+      - name: Install Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: '3.x'
+
+      # c.f. https://github.com/actions/download-artifact/issues/3#issuecomment-1017141067
+      - name: Download wheel artifacts from last build on 'main'
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PROJECT_REPO="matplotlib/matplotlib"
+          BRANCH="main"
+          WORKFLOW_NAME="cibuildwheel.yml"
+          ARTIFACT_NAME="wheels"
+
+          gh run --repo "${PROJECT_REPO}" \
+             list --branch "${BRANCH}" \
+                  --workflow "${WORKFLOW_NAME}" \
+                  --json event,status,databaseId > runs.json
+          # Filter on 'push' events to main (merged PRs) that have completed
+          jq --compact-output \
+            '[ .[] | select(.event == "push") | select(.status == "completed") ]' \
+            runs.json > pushes.json
+          # Get id of latest build of wheels
+          RUN_ID=$(
+            jq --compact-output \
+              'sort_by(.databaseId) | reverse | .[0].databaseId' pushes.json
+          )
+          gh run --repo "${PROJECT_REPO}" \
+             download "${RUN_ID}" --name "${ARTIFACT_NAME}"
+
+          mkdir dist
+          mv *.whl dist/
+          ls -l dist/
+
+      - name: Install anaconda-client
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+          # c.f. https://github.com/Anaconda-Platform/anaconda-client/issues/540
+          python -m pip install git+https://github.com/Anaconda-Server/anaconda-client@be1e14936a8e947da94d026c990715f0596d7043
+          python -m pip list
+
+      - name: Upload wheels to Anaconda Cloud as nightlies
+        run: |
+          anaconda --token ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} upload \
+            --user scipy-wheels-nightly \
+            --skip-existing \
+            dist/matplotlib-*.whl

.github/workflows/reviewdog.yml

@@ -6,10 +6,10 @@ jobs:
     name: flake8
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python 3
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v3
         with:
           python-version: 3.8
 
@@ -37,7 +37,7 @@ jobs:
     name: eslint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: eslint
         uses: reviewdog/action-eslint@v1