matplotlib · erdmsen · Apr 16, 2021 · May 8, 2021 · May 14, 2021 · May 14, 2021
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -104,13 +104,10 @@ jobs:
         run: |
           python -m cibuildwheel --output-dir dist
         env:
-          CIBW_BUILD: "pp3?-*"
+          CIBW_BUILD: "pp37-*"
           CIBW_BEFORE_BUILD: pip install certifi numpy==${{ env.min-numpy-version }}
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-        if: >
-          runner.os != 'Windows' && (
-          startsWith(github.ref, 'refs/heads/v3.3') ||
-          startsWith(github.ref, 'refs/tags/v3.3') )
+        if: runner.os != 'Windows' && matrix.cibw_archs != 'aarch64'
 
       - name: Validate that LICENSE files are included in wheels
         run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -22,18 +22,18 @@ jobs:
       matrix:
         include:
           - name-suffix: "(Minimum Versions)"
-            os: ubuntu-16.04
+            os: ubuntu-18.04
             python-version: 3.7
             extra-requirements: '-c requirements/testing/minver.txt'
             pyqt5-ver: '==5.8 sip==4.19.7'  # oldest versions with a Py3.7 wheel.
             delete-font-cache: true
             XVFB_RUN: xvfb-run -a
-          - os: ubuntu-16.04
+          - os: ubuntu-18.04
             python-version: 3.7
             extra-requirements: '-r requirements/testing/extra.txt'
             XVFB_RUN: xvfb-run -a
             CFLAGS: "-fno-lto"  # Ensure that disabling LTO works.
-          - os: ubuntu-16.04
+          - os: ubuntu-18.04
             python-version: 3.8
             extra-requirements: '-r requirements/testing/extra.txt'
             XVFB_RUN: xvfb-run -a
@@ -128,10 +128,10 @@ jobs:
             ~/.cache/matplotlib
             !~/.cache/matplotlib/tex.cache
             !~/.cache/matplotlib/test_cache
-          key: ${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
+          key: 1-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
-            ${{ runner.os }}-py${{ matrix.python-version }}-mpl-
+            1-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
+            1-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
 
       - name: Install Python dependencies
         run: |
@@ -156,12 +156,8 @@ jobs:
           # libraries cannot be loaded at runtime, so an actual import is a
           # better check).
           if [[ "${{ runner.os }}" != 'macOS' ]]; then
-            # PyGObject, pycairo, and cariocffi do not install on OSX 10.12;
-            # pycairo 1.20+ requires a new version of Cairo, unavailable on
-            # Ubuntu 16.04, so PyGObject must be installed without build
-            # isolation in order to pick up the lower pre-installed version.
-             python -m pip install --upgrade 'pycairo<1.20.0' 'cairocffi>=0.8' &&
-             python -m pip install --upgrade --no-build-isolation PyGObject &&
+            # PyGObject, pycairo, and cariocffi do not install on OSX 10.12.
+             python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&
                python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
                echo 'PyGObject is available' ||
                echo 'PyGObject is not available'
@@ -180,7 +176,7 @@ jobs:
                echo 'PySide2 is not available'
           fi
           python -m pip install --upgrade \
-            -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-16.04 \
+            -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04 \
             wxPython &&
             python -c 'import wx' &&
             echo 'wxPython is available' ||
@@ -226,3 +222,9 @@ jobs:
         if: ${{ runner.os != 'macOS' }}
       - name: Upload code coverage
         uses: codecov/codecov-action@v1
+
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: "${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.name-suffix }} result images"
+          path: ./result_images
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -6,13 +6,13 @@
 strategy:
   matrix:
     Linux_py37:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-18.04'
       python.version: '3.7'
     Linux_py38:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-18.04'
       python.version: '3.8'
     Linux_py39:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-18.04'
       python.version: '3.9'
     macOS_py37:
       vmImage: 'macOS-10.15'

diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -61,7 +61,7 @@
             <li><a href="{{ pathto('devel/index') }}">Contributing</a></li>
             <li class="nav-right">
                 <form class="search" action="{{ pathto('search') }}" method="get">
-                <input type="text" name="q" aria-labelledby="searchlabel" placeholder="Search"/>
+                <input type="text" name="q" aria-labelledby="searchlabel" placeholder="Search" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"/>
                 </form>
             </li>
         </ul>

diff --git a/doc/_templates/search.html b/doc/_templates/search.html
@@ -17,7 +17,7 @@ <h1 id="search-documentation">{{ _('Search') }}</h1>
     "codex ellipse".
   </p>
   <form action="" method="get">
-    <input type="text" name="q" value="" />
+    <input type="text" name="q" value="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"/>
     <input type="submit" value="{{ _('search') }}" />
     <span id="search-progress" style="padding-left: 10px"></span>
   </form>

diff --git a/doc/api/prev_api_changes/api_changes_3.4.0/deprecations.rst b/doc/api/prev_api_changes/api_changes_3.4.0/deprecations.rst
@@ -63,12 +63,6 @@ similar replacements.
 ``STYLE_FILE_PATTERN``, ``load_base_library``, and ``iter_user_libraries`` are
 deprecated.
 
-``Tick.apply_tickdir`` is deprecated
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-``apply_tickdir`` didn't actually update the tick markers on the existing
-Line2D objects used to draw the ticks; use `.Axis.set_tick_params` instead.
-
 ``dpi_cor`` property of `.FancyArrowPatch`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/examples/event_handling/pipong.py b/examples/event_handling/pipong.py
@@ -124,8 +124,10 @@ class Game:
     def __init__(self, ax):
         # create the initial line
         self.ax = ax
-        ax.set_ylim([-1, 1])
+        ax.xaxis.set_visible(False)
         ax.set_xlim([0, 7])
+        ax.yaxis.set_visible(False)
+        ax.set_ylim([-1, 1])
         pad_a_x = 0
         pad_b_x = .50
         pad_a_y = pad_b_y = .30
@@ -168,7 +170,6 @@ def __init__(self, ax):
         self.res = 100.0
         self.on = False
         self.inst = True    # show instructions from the beginning
-        self.background = None
         self.pads = [Pad(pA, pad_a_x, pad_a_y),
                      Pad(pB, pad_b_x, pad_b_y, 'r')]
         self.pucks = []
@@ -177,7 +178,7 @@ def __init__(self, ax):
                                   verticalalignment='center',
                                   horizontalalignment='center',
                                   multialignment='left',
-                                  textcoords='axes fraction',
+                                  xycoords='axes fraction',
                                   animated=False)
         self.canvas.mpl_connect('key_press_event', self.on_key_press)
 

diff --git a/examples/user_interfaces/fourier_demo_wx_sgskip.py b/examples/user_interfaces/fourier_demo_wx_sgskip.py
@@ -70,7 +70,7 @@ def __init__(self, parent, label, param):
         self.sliderText = wx.TextCtrl(parent, -1, style=wx.TE_PROCESS_ENTER)
         self.slider = wx.Slider(parent, -1)
         # self.slider.SetMax(param.maximum*1000)
-        self.slider.SetRange(0, param.maximum * 1000)
+        self.slider.SetRange(0, int(param.maximum * 1000))
         self.setKnob(param.value)
 
         sizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -99,7 +99,7 @@ def sliderTextHandler(self, event):
 
     def setKnob(self, value):
         self.sliderText.SetValue('%g' % value)
-        self.slider.SetValue(value * 1000)
+        self.slider.SetValue(int(value * 1000))
 
 
 class FourierDemoFrame(wx.Frame):

diff --git a/examples/user_interfaces/svg_histogram_sgskip.py b/examples/user_interfaces/svg_histogram_sgskip.py
@@ -149,7 +149,7 @@
 """ % json.dumps(hist_patches)
 
 # Add a transition effect
-css = tree.getchildren()[0][0]
+css = tree.find('.//{http://www.w3.org/2000/svg}style')
 css.text = css.text + "g {-webkit-transition:opacity 0.4s ease-out;" + \
     "-moz-transition:opacity 0.4s ease-out;}"
 

diff --git a/examples/widgets/span_selector.py b/examples/widgets/span_selector.py
@@ -32,10 +32,12 @@ def onselect(xmin, xmax):
 
     region_x = x[indmin:indmax]
     region_y = y[indmin:indmax]
-    line2.set_data(region_x, region_y)
-    ax2.set_xlim(region_x[0], region_x[-1])
-    ax2.set_ylim(region_y.min(), region_y.max())
-    fig.canvas.draw()
+
+    if len(region_x) >= 2:
+        line2.set_data(region_x, region_y)
+        ax2.set_xlim(region_x[0], region_x[-1])
+        ax2.set_ylim(region_y.min(), region_y.max())
+        fig.canvas.draw()
 
 #############################################################################
 # .. note::

diff --git a/extern/ttconv/pprdrv_tt.cpp b/extern/ttconv/pprdrv_tt.cpp
@@ -798,33 +798,36 @@ void ttfont_sfnts(TTStreamWriter& stream, struct TTFONT *font)
     ** Find the tables we want and store there vital
     ** statistics in tables[].
     */
-    for (x=0; x < 9; x++ )
-    {
-        do
-        {
-            diff = strncmp( (char*)ptr, table_names[x], 4 );
-
-            if ( diff > 0 )             /* If we are past it. */
-            {
-                tables[x].length = 0;
-                diff = 0;
-            }
-            else if ( diff < 0 )        /* If we haven't hit it yet. */
-            {
-                ptr += 16;
-            }
-            else if ( diff == 0 )       /* Here it is! */
-            {
-                tables[x].newoffset = nextoffset;
-                tables[x].checksum = getULONG( ptr + 4 );
-                tables[x].oldoffset = getULONG( ptr + 8 );
-                tables[x].length = getULONG( ptr + 12 );
-                nextoffset += ( ((tables[x].length + 3) / 4) * 4 );
-                count++;
-                ptr += 16;
-            }
-        }
-        while (diff != 0);
+    ULONG num_tables_read = 0;  /* Number of tables read from the directory */
+    for (x = 0; x < 9; x++) {
+        do {
+          if (num_tables_read < font->numTables) {
+              /* There are still tables to read from ptr */
+              diff = strncmp((char*)ptr, table_names[x], 4);
+
+              if (diff > 0) {           /* If we are past it. */
+                  tables[x].length = 0;
+                  diff = 0;
+              } else if (diff < 0) {      /* If we haven't hit it yet. */
+                  ptr += 16;
+                  num_tables_read++;
+              } else if (diff == 0) {     /* Here it is! */
+                  tables[x].newoffset = nextoffset;
+                  tables[x].checksum = getULONG( ptr + 4 );
+                  tables[x].oldoffset = getULONG( ptr + 8 );
+                  tables[x].length = getULONG( ptr + 12 );
+                  nextoffset += ( ((tables[x].length + 3) / 4) * 4 );
+                  count++;
+                  ptr += 16;
+                  num_tables_read++;
+              }
+          } else {
+            /* We've read the whole table directory already */
+            /* Some tables couldn't be found */
+            tables[x].length = 0;
+            break;  /* Proceed to next tables[x] */
+          }
+        } while (diff != 0);
 
     } /* end of for loop which passes over the table directory */
 
@@ -841,17 +844,24 @@ void ttfont_sfnts(TTStreamWriter& stream, struct TTFONT *font)
 
     /* Now, generate those silly numTables numbers. */
     sfnts_pputUSHORT(stream, count);            /* number of tables */
-    if ( count == 9 )
-    {
-        sfnts_pputUSHORT(stream, 7);          /* searchRange */
-        sfnts_pputUSHORT(stream, 3);          /* entrySelector */
-        sfnts_pputUSHORT(stream, 81);         /* rangeShift */
+
+    int search_range = 1;
+    int entry_sel = 0;
+
+    while (search_range <= count) {
+        search_range <<= 1;
+        entry_sel++;
     }
+    entry_sel = entry_sel > 0 ? entry_sel - 1 : 0;
+    search_range = (search_range >> 1) * 16;
+    int range_shift = count * 16 - search_range;
+
+    sfnts_pputUSHORT(stream, search_range);      /* searchRange */
+    sfnts_pputUSHORT(stream, entry_sel);         /* entrySelector */
+    sfnts_pputUSHORT(stream, range_shift);       /* rangeShift */
+
 #ifdef DEBUG_TRUETYPE
-    else
-    {
-        debug("only %d tables selected",count);
-    }
+    debug("only %d tables selected",count);
 #endif
 
     /* Now, emmit the table directory. */

diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -4130,33 +4130,24 @@ def _set_view_from_bbox(self, bbox, direction='in',
             Whether this axis is twinned in the *y*-direction.
         """
         if len(bbox) == 3:
-            Xmin, Xmax = self.get_xlim()
-            Ymin, Ymax = self.get_ylim()
-
             xp, yp, scl = bbox  # Zooming code
-
             if scl == 0:  # Should not happen
                 scl = 1.
-
             if scl > 1:
                 direction = 'in'
             else:
                 direction = 'out'
                 scl = 1/scl
-
             # get the limits of the axes
-            tranD2C = self.transData.transform
-            xmin, ymin = tranD2C((Xmin, Ymin))
-            xmax, ymax = tranD2C((Xmax, Ymax))
-
+            (xmin, ymin), (xmax, ymax) = self.transData.transform(
+                np.transpose([self.get_xlim(), self.get_ylim()]))
             # set the range
             xwidth = xmax - xmin
             ywidth = ymax - ymin
             xcen = (xmax + xmin)*.5
             ycen = (ymax + ymin)*.5
             xzc = (xp*(scl - 1) + xcen)/scl
             yzc = (yp*(scl - 1) + ycen)/scl
-
             bbox = [xzc - xwidth/2./scl, yzc - ywidth/2./scl,
                     xzc + xwidth/2./scl, yzc + ywidth/2./scl]
         elif len(bbox) != 4:
@@ -4209,8 +4200,10 @@ def _set_view_from_bbox(self, bbox, direction='in',
 
         if not twinx and mode != "y":
             self.set_xbound(new_xbound)
+            self.set_autoscalex_on(False)
         if not twiny and mode != "x":
             self.set_ybound(new_ybound)
+            self.set_autoscaley_on(False)
 
     def start_pan(self, x, y, button):
         """