FIX: restore (and test) handling of nan in hist data

tacaswell · tacaswell · commit 388a20981be9 · 2019-03-31T14:57:58.000-04:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -6659,6 +6659,19 @@ def hist(self, x, bins=None, range=None, density=None, weights=None,
 
         hist_kwargs = dict()
 
+        # if the bin_range is not given, compute without nan numpy
+        # does not do this for us when guessing the range (but will
+        # happily ignore nans when computing the histogram).
+        if bin_range is None:
+            xmin = np.inf
+            xmax = -np.inf
+            for xi in x:
+                if len(xi):
+                    xmin = min(xmin, np.nanmin(xi))
+                    xmax = max(xmax, np.nanmax(xi))
+            if xmax > xmin:
+                bin_range = (xmin, xmax)
+
         # If bins are not specified either explicitly or via range,
         # we need to figure out the range required for all datasets,
         # and supply that to np.histogram.
@@ -6667,6 +6680,7 @@ def hist(self, x, bins=None, range=None, density=None, weights=None,
                 _w = np.concatenate(w)
             else:
                 _w = None
+
             bins = histogram_bin_edges(np.concatenate(x),
                                        bins, bin_range, _w)
         else:
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -6352,3 +6352,17 @@ def test_hist_auto_bins():
     _, bins, _ = plt.hist([[1, 2, 3], [3, 4, 5, 6]], bins='auto')
     assert bins[0] <= 1
     assert bins[-1] >= 6
+
+
+def test_hist_nan_data():
+    fig, (ax1, ax2) = plt.subplots(2)
+
+    data = [1, 2, 3]
+    nan_data = data + [np.nan]
+
+    bins, edges, _ = ax1.hist(data)
+    with np.errstate(invalid='ignore'):
+        nanbins, nanedges, _ = ax2.hist(nan_data)
+
+    assert np.allclose(bins, nanbins)
+    assert np.allclose(edges, nanedges)
