Merge pull request #19500 from anntzer/np116

timhoffm · web-flow · commit d235b026365c · 2021-02-16T08:58:04.000+01:00
diff --git a/doc/api/next_api_changes/development/19500-AL.rst b/doc/api/next_api_changes/development/19500-AL.rst
@@ -0,0 +1,2 @@
+Matplotlib now requires numpy>=1.16
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -143,10 +143,10 @@ def _check_versions():
 
     for modname, minver in [
             ("cycler", "0.10"),
-            ("dateutil", "2.1"),
+            ("dateutil", "2.7"),
             ("kiwisolver", "1.0.1"),
-            ("numpy", "1.15"),
-            ("pyparsing", "2.0.1"),
+            ("numpy", "1.16"),
+            ("pyparsing", "2.2.1"),
     ]:
         module = importlib.import_module(modname)
         if LooseVersion(module.__version__) < minver:
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -677,13 +677,10 @@ def union(bboxes):
         """Return a `Bbox` that contains all of the given *bboxes*."""
         if not len(bboxes):
             raise ValueError("'bboxes' cannot be empty")
-        # needed for 1.14.4 < numpy_version < 1.16
-        # can remove once we are at numpy >= 1.16
-        with np.errstate(invalid='ignore'):
-            x0 = np.min([bbox.xmin for bbox in bboxes])
-            x1 = np.max([bbox.xmax for bbox in bboxes])
-            y0 = np.min([bbox.ymin for bbox in bboxes])
-            y1 = np.max([bbox.ymax for bbox in bboxes])
+        x0 = np.min([bbox.xmin for bbox in bboxes])
+        x1 = np.max([bbox.xmax for bbox in bboxes])
+        y0 = np.min([bbox.ymin for bbox in bboxes])
+        y1 = np.max([bbox.ymax for bbox in bboxes])
         return Bbox([[x0, y0], [x1, y1]])
 
     @staticmethod

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Matplotlib now requires numpy>=1.16`
	`2`	`+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`