Merge pull request #14891 from QuLogic/fix-nightly

jklymak · web-flow · commit 9baab6900f63 · 2019-07-26T12:24:50.000-07:00
Fix nightly test errors
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1645,7 +1645,7 @@ def axis(self, *args, emit=True, **kwargs):
                     self.set_autoscale_on(False)
                     xlim = self.get_xlim()
                     ylim = self.get_ylim()
-                    edge_size = max(np.diff(xlim), np.diff(ylim))
+                    edge_size = max(np.diff(xlim), np.diff(ylim))[0]
                     self.set_xlim([xlim[0], xlim[0] + edge_size],
                                   emit=emit, auto=False)
                     self.set_ylim([ylim[0], ylim[0] + edge_size],
diff --git a/lib/matplotlib/backends/qt_editor/_formlayout.py b/lib/matplotlib/backends/qt_editor/_formlayout.py
@@ -298,7 +298,7 @@ def setup(self):
                     field.setCheckState(QtCore.Qt.Unchecked)
             elif isinstance(value, Integral):
                 field = QtWidgets.QSpinBox(self)
-                field.setRange(-1e9, 1e9)
+                field.setRange(-10**9, 10**9)
                 field.setValue(value)
             elif isinstance(value, Real):
                 field = QtWidgets.QLineEdit(repr(value), self)
