File tree Expand file tree Collapse file tree 2 files changed +5
-8
lines changed Expand file tree Collapse file tree 2 files changed +5
-8
lines changed Original file line number Diff line number Diff line change @@ -145,7 +145,7 @@ def _check_versions():
145
145
("cycler" , "0.10" ),
146
146
("dateutil" , "2.1" ),
147
147
("kiwisolver" , "1.0.1" ),
148
- ("numpy" , "1.15 " ),
148
+ ("numpy" , "1.16 " ),
149
149
("pyparsing" , "2.0.1" ),
150
150
]:
151
151
module = importlib .import_module (modname )
Original file line number Diff line number Diff line change @@ -677,13 +677,10 @@ def union(bboxes):
677
677
"""Return a `Bbox` that contains all of the given *bboxes*."""
678
678
if not len (bboxes ):
679
679
raise ValueError ("'bboxes' cannot be empty" )
680
- # needed for 1.14.4 < numpy_version < 1.16
681
- # can remove once we are at numpy >= 1.16
682
- with np .errstate (invalid = 'ignore' ):
683
- x0 = np .min ([bbox .xmin for bbox in bboxes ])
684
- x1 = np .max ([bbox .xmax for bbox in bboxes ])
685
- y0 = np .min ([bbox .ymin for bbox in bboxes ])
686
- y1 = np .max ([bbox .ymax for bbox in bboxes ])
680
+ x0 = np .min ([bbox .xmin for bbox in bboxes ])
681
+ x1 = np .max ([bbox .xmax for bbox in bboxes ])
682
+ y0 = np .min ([bbox .ymin for bbox in bboxes ])
683
+ y1 = np .max ([bbox .ymax for bbox in bboxes ])
687
684
return Bbox ([[x0 , y0 ], [x1 , y1 ]])
688
685
689
686
@staticmethod
You can’t perform that action at this time.
0 commit comments