Merge branch 'main' into 3d_plot_focal_length

Author: scottshambaugh

.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" ]] && \

.flake8

@@ -100,7 +100,7 @@ per-file-ignores =
     tutorials/introductory/images.py: E402, E501
     tutorials/introductory/pyplot.py: E402, E501
     tutorials/introductory/sample_plots.py: E501
-    tutorials/introductory/usage.py: E703
+    tutorials/introductory/quick_start.py: E703
     tutorials/text/annotations.py: E402, E501
     tutorials/text/text_intro.py: E402
     tutorials/text/text_props.py: E501

.github/workflows/tests.yml

@@ -9,7 +9,6 @@ on:
 
 env:
   NO_AT_BRIDGE: 1  # Necessary for GTK3 interactive test.
-  NPY_DISABLE_CPU_FEATURES: "AVX512F,AVX512CD,AVX512VL,AVX512BW,AVX512DQ,AVX512_SKX"
   OPENBLAS_NUM_THREADS: 1
   PYTHONFAULTHANDLER: 1
 
@@ -44,7 +43,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

azure-pipelines.yml

@@ -129,7 +129,6 @@ stages:
         displayName: 'print env'
 
       - bash: |
-          export NPY_DISABLE_CPU_FEATURES="AVX512F,AVX512CD,AVX512VL,AVX512BW,AVX512DQ,AVX512_SKX"
           PYTHONFAULTHANDLER=1 python -m pytest --junitxml=junit/test-results.xml -raR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n 2 ||
             [[ "$PYTHON_VERSION" = 'Pre' ]]
         displayName: 'pytest'

doc/api/mathtext_api.rst

@@ -9,4 +9,3 @@
    :members:
    :undoc-members:
    :show-inheritance:
-   :exclude-members: Box, Char, ComputerModernFontConstants, DejaVuSansFontConstants, DejaVuSerifFontConstants, FontConstantsBase, Fonts, Glue, Kern, Node, Parser, STIXFontConstants, STIXSansFontConstants, Ship, StandardPsFonts, TruetypeFonts

doc/api/next_api_changes/behavior/22013-AL.rst

@@ -0,0 +1,5 @@
+``FigureFrameWx.sizer``
+~~~~~~~~~~~~~~~~~~~~~~~
+... has been removed.  The frame layout is no longer based on a sizer, as the
+canvas is now the sole child widget; the toolbar is now a regular toolbar
+added using ``SetToolBar``.

doc/api/next_api_changes/behavior/22063-SR.rst

@@ -0,0 +1,7 @@
+Move Axes title to not overlap with y axis offset
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Previously, Axes titles could overlap the y-axis offset text, which is often
+in the upper left corner of the axes.  Now titles are moved above the offset
+text if overlapping, and autopositioning is in effect (i.e. if *y* in
+`.Axes.set_title` is *None* and :rc:`axes.titley` is also *None*).

doc/api/next_api_changes/deprecations/21965-AL.rst

@@ -0,0 +1,5 @@
+``transOffset`` parameter name
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The ``transOffset`` parameter of `.Collection.set_offset_transform` and the
+various ``create_collection`` methods of legend handlers has been renamed to
+``offset_transform`` (consistently with the property name).

doc/api/next_api_changes/deprecations/22084-SS.rst

@@ -0,0 +1,4 @@
+``Axes3D.dist``
+~~~~~~~~~~~~~~~
+... has been privatized. Use the ``zoom`` keyword argument in
+`.Axes3D.set_box_aspect` instead.

doc/api/next_api_changes/deprecations/22098-AL.rst

@@ -0,0 +1,13 @@
+``axes_grid`` and ``axisartist`` removals
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The following deprecated APIs have been removed:
+
+- ``SubplotDivider.figbox``, ``SubplotDivider.update_params``,
+- ``SubplotDivider.get_geometry`` (use ``get_subplotspec`` instead),
+- ``change_geometry`` (use ``set_subplotspec`` instead),
+- ``ParasiteAxesBase.update_viewlim`` (use ``apply_aspect`` instead),
+- ``ParasiteAxesAuxTransBase`` (use ``ParasiteAxesBase`` instead),
+- ``parasite_axes_auxtrans_class_factory`` (use ``parasite_axes_class_factory``
+  instead),
+-  ``ParasiteAxesAuxTrans`` (use ``ParasiteAxes`` instead),