From b8589b64855ef3a441659a3d409ea48ea2cbcd8d Mon Sep 17 00:00:00 2001 From: Julia Signell Date: Fri, 1 Aug 2025 15:30:48 -0400 Subject: [PATCH 1/2] Fix doctests by ignoring warning from netcdf --- xarray/tests/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/xarray/tests/__init__.py b/xarray/tests/__init__.py index 4de9e422761..787c01eaf62 100644 --- a/xarray/tests/__init__.py +++ b/xarray/tests/__init__.py @@ -48,6 +48,7 @@ warnings.filterwarnings("ignore", "'urllib3.contrib.pyopenssl' module is deprecated") warnings.filterwarnings("ignore", "Deprecated call to `pkg_resources.declare_namespace") warnings.filterwarnings("ignore", "pkg_resources is deprecated as an API") +warnings.filterwarnings("ignore", message="numpy.ndarray size changed") arm_xfail = pytest.mark.xfail( platform.machine() == "aarch64" or "arm" in platform.machine(), From d4805c55a99ad30fdcf9d1de09cb6f746835c8d4 Mon Sep 17 00:00:00 2001 From: Julia Signell Date: Fri, 1 Aug 2025 15:49:01 -0400 Subject: [PATCH 2/2] Fix mypy issues in tests --- xarray/tests/test_plot.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xarray/tests/test_plot.py b/xarray/tests/test_plot.py index 790ee416e82..3dd8a4fa689 100644 --- a/xarray/tests/test_plot.py +++ b/xarray/tests/test_plot.py @@ -331,9 +331,10 @@ def test_2d_line_accepts_legend_kw(self) -> None: assert not plt.gca().get_legend() plt.cla() self.darray[:, :, 0].plot.line(x="dim_0", add_legend=True) - assert plt.gca().get_legend() + legend = plt.gca().get_legend() + assert legend is not None # check whether legend title is set - assert plt.gca().get_legend().get_title().get_text() == "dim_1" + assert legend.get_title().get_text() == "dim_1" def test_2d_line_accepts_x_kw(self) -> None: self.darray[:, :, 0].plot.line(x="dim_0") @@ -344,10 +345,14 @@ def test_2d_line_accepts_x_kw(self) -> None: def test_2d_line_accepts_hue_kw(self) -> None: self.darray[:, :, 0].plot.line(hue="dim_0") - assert plt.gca().get_legend().get_title().get_text() == "dim_0" + legend = plt.gca().get_legend() + assert legend is not None + assert legend.get_title().get_text() == "dim_0" plt.cla() self.darray[:, :, 0].plot.line(hue="dim_1") - assert plt.gca().get_legend().get_title().get_text() == "dim_1" + legend = plt.gca().get_legend() + assert legend is not None + assert legend.get_title().get_text() == "dim_1" def test_2d_coords_line_plot(self) -> None: lon, lat = np.meshgrid(np.linspace(-20, 20, 5), np.linspace(0, 30, 4)) @@ -2917,7 +2922,9 @@ def test_legend_labels(self) -> None: pc = ds2.plot.scatter(x="A", y="B", markersize="hue") axes = pc.axes assert axes is not None - actual = [t.get_text() for t in axes.get_legend().texts] + legend = axes.get_legend() + assert legend is not None + actual = [t.get_text() for t in legend.texts] expected = ["hue", "a", "b"] assert actual == expected