Merge branch 'main' into feature/asinh-scale

Author: rwpenney

.appveyor.yml

@@ -18,7 +18,7 @@ environment:
     PYTHONIOENCODING: UTF-8
     PYTEST_ARGS: -raR --numprocesses=auto --timeout=300 --durations=25
                  --cov-report= --cov=lib --log-level=DEBUG
-    PINNEDVERS: "pyzmq!=21.0.0 pyzmq!=22.0.0"
+    PINNEDVERS: "pyzmq!=21.0.0,!=22.0.0"
 
   matrix:
     # In theory we could use a single CONDA_INSTALL_LOCN because we construct
@@ -55,7 +55,7 @@ install:
   - conda config --prepend channels conda-forge
 
   # For building, use a new environment
-  - conda create -q -n test-environment python=%PYTHON_VERSION% tk
+  - conda create -q -n test-environment python=%PYTHON_VERSION% tk "pip<22.0"
   - activate test-environment
   # pull pywin32 from conda because on py38 there is something wrong with finding
   # the dlls when insalled from pip

.circleci/config.yml

@@ -28,7 +28,7 @@ commands:
           name: Merge with upstream
           command: |
             if ! git remote -v | grep upstream; then
-              git remote add upstream git://github.com/matplotlib/matplotlib.git
+              git remote add upstream https://github.com/matplotlib/matplotlib.git
             fi
             git fetch upstream
             if [[ "$CIRCLE_BRANCH" != "main" ]] && \
@@ -85,7 +85,7 @@ commands:
           command: |
             python -m pip install --upgrade --user pip
             python -m pip install --upgrade --user wheel
-            python -m pip install --upgrade --user setuptools
+            python -m pip install --upgrade --user 'setuptools!=60.6.0'
 
   deps-install:
     parameters:
@@ -104,7 +104,15 @@ commands:
     steps:
       - run:
           name: Install Matplotlib
-          command: python -m pip install --user -ve .
+          command: |
+            if [[ "$CIRCLE_BRANCH" == v*-doc ]]; then
+              # The v*-doc branches must build against the specified release.
+              version=${CIRCLE_BRANCH%-doc}
+              version=${version#v}
+              python -m pip install matplotlib==${version}
+            else
+              python -m pip install --user -ve .
+            fi
       - save_cache:
           key: build-deps-1
           paths:

.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/quick_start.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/workflows/cibuildwheel.yml

@@ -1,15 +1,30 @@
 name: Build CI wheels
 
 on:
+  # Save CI by only running this on release branches or tags.
   push:
     branches:
       - main
       - v[0-9]+.[0-9]+.x
     tags:
       - v*
+  # Also allow running this action on PRs if requested by applying the
+  # "Run cibuildwheel" label.
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
 
 jobs:
   build_wheels:
+    if: |
+      (
+        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:

.github/workflows/clean_pr.yml

@@ -25,8 +25,19 @@ jobs:
           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)"
+                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
+      - name: Check for invalid backports to -doc branches
+        if: endsWith(github.base_ref, '-doc')
+        run: |
+          git fetch --quiet origin "$GITHUB_BASE_REF"
+          base="$(git merge-base "origin/$GITHUB_BASE_REF" 'HEAD^2')"
+          lib="$(git log "$base..HEAD^2" --pretty=tformat: --name-status -- lib src |
+                 cut --fields 2 | sort || true)"
+          if [[ -n "$lib" ]]; then
+            printf 'Changes to the following files have no effect and should not be backported:\n%s\n' "$lib"
+            exit 1
+          fi

.github/workflows/pr_welcome.yml

@@ -7,30 +7,29 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/first-interaction@v1
-      with:
-        add-labels: "status: needs workflow approval"
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        pr-message: >+
-          Thank you for opening your first PR into Matplotlib!
+      - uses: actions/first-interaction@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          pr-message: >+
+            Thank you for opening your first PR into Matplotlib!
 
 
-          If you have not heard from us in a while, please feel free to
-          ping `@matplotlib/developers` or anyone who has commented on the
-          PR.  Most of our reviewers are volunteers and sometimes
-          things fall through the cracks.
+            If you have not heard from us in a while, please feel free to ping
+            `@matplotlib/developers` or anyone who has commented on the PR.
+            Most of our reviewers are volunteers and sometimes things fall
+            through the cracks.
 
 
-          You can also join us [on
-          gitter](https://gitter.im/matplotlib/matplotlib) for real-time
-          discussion.
+            You can also join us [on
+            gitter](https://gitter.im/matplotlib/matplotlib) for real-time
+            discussion.
 
 
-          For details on testing, writing docs, and our review process,
-          please see [the developer
-          guide](https://matplotlib.org/devdocs/devel/index.html)
+            For details on testing, writing docs, and our review process,
+            please see [the developer
+            guide](https://matplotlib.org/devdocs/devel/index.html)
 
 
-          We strive to be a welcoming and open project. Please follow our
-          [Code of
-          Conduct](https://github.com/matplotlib/matplotlib/blob/main/CODE_OF_CONDUCT.md).
+            We strive to be a welcoming and open project. Please follow our
+            [Code of
+            Conduct](https://github.com/matplotlib/matplotlib/blob/main/CODE_OF_CONDUCT.md).

.github/workflows/tests.yml

@@ -6,6 +6,8 @@ on:
       - auto-backport-of-pr-[0-9]+
       - v[0-9]+.[0-9]+.[0-9x]+-doc
   pull_request:
+    branches-ignore:
+      - v[0-9]+.[0-9]+.[0-9x]+-doc
 
 env:
   NO_AT_BRIDGE: 1  # Necessary for GTK3 interactive test.
@@ -14,6 +16,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 }}
 
@@ -42,7 +45,7 @@ jobs:
             extra-requirements: '-r requirements/testing/extra.txt'
             XVFB_RUN: xvfb-run -a
           - os: ubuntu-20.04
-            python-version: '3.10-dev'
+            python-version: '3.10'
             # Re-add this when extra dependencies have wheels.
             # extra-requirements: '-r requirements/testing/extra.txt'
             XVFB_RUN: xvfb-run -a
@@ -234,7 +237,7 @@ jobs:
 
           # 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
@@ -249,7 +252,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: |

.pre-commit-config.yaml

@@ -0,0 +1,29 @@
+ci:
+  autofix_prs: false
+  autoupdate_schedule: 'quarterly'
+exclude: |
+  (?x)^(
+    extern|
+    lib/matplotlib/mpl-data|
+    doc/devel/gitwash|
+    doc/users/prev|
+    doc/api/prev|
+    lib/matplotlib/tests/tinypages
+    )
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1
+    hooks:
+      - id: check-added-large-files
+      - id: check-docstring-first
+      - id: end-of-file-fixer
+        exclude_types: [svg]
+      - id: mixed-line-ending
+      - id: trailing-whitespace
+        exclude_types: [svg]
+  - repo: https://github.com/pycqa/flake8
+    rev: 3.9.2
+    hooks:
+      - id: flake8
+        additional_dependencies: [pydocstyle>5.1.0, flake8-docstrings>1.4.0]
+        args: ["--docstring-convention=all"]

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