From 4677fd9f42d3cb0b38f09da40a38435650f134c4 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Tue, 1 Oct 2019 20:13:42 +0200 Subject: [PATCH] Fix broken CI. - Fix broken imports. - Workaround Arc bug. --- lib/matplotlib/backend_bases.py | 1 + lib/matplotlib/patches.py | 2 +- lib/matplotlib/tests/test_compare_images.py | 1 - lib/matplotlib/tests/test_image.py | 3 +-- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py index f7cf83ae753c..f52e43be4aa3 100644 --- a/lib/matplotlib/backend_bases.py +++ b/lib/matplotlib/backend_bases.py @@ -45,6 +45,7 @@ import numpy as np +import matplotlib as mpl from matplotlib import ( backend_tools as tools, cbook, colors, textpath, tight_bbox, transforms, widgets, get_backend, is_interactive, rcParams) diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py index e758b960c02a..d7d1290f4a4b 100644 --- a/lib/matplotlib/patches.py +++ b/lib/matplotlib/patches.py @@ -1667,7 +1667,7 @@ def segment_circle_intersect(x0, y0, x1, y1): # circle in the same way that it is relative to the desired ellipse. box_path = Path.unit_rectangle() box_path_transform = (transforms.BboxTransformTo(self.axes.bbox) - - self.get_transform()) + + self.get_transform().inverted()) box_path = box_path.transformed(box_path_transform) thetas = set() diff --git a/lib/matplotlib/tests/test_compare_images.py b/lib/matplotlib/tests/test_compare_images.py index d9a5bfeff037..4d9d6ef62395 100644 --- a/lib/matplotlib/tests/test_compare_images.py +++ b/lib/matplotlib/tests/test_compare_images.py @@ -1,4 +1,3 @@ -import os from pathlib import Path import shutil diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py index d16f5dfd8a01..67ac022daa1f 100644 --- a/lib/matplotlib/tests/test_image.py +++ b/lib/matplotlib/tests/test_image.py @@ -13,8 +13,7 @@ from numpy.testing import assert_array_equal from matplotlib import ( - colors, image as mimage, patches, pyplot as plt, style, - rc_context, rcParams) + colors, image as mimage, patches, pyplot as plt, style, rcParams) from matplotlib.cbook import MatplotlibDeprecationWarning from matplotlib.image import (AxesImage, BboxImage, FigureImage, NonUniformImage, PcolorImage)