Skip to content

Commit

Permalink
MNT: drop now unneeded _mpl_imports module
Browse files Browse the repository at this point in the history
  • Loading branch information
neutrinoceros committed Jun 9, 2023
1 parent 97b1277 commit 08d8f45
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 34 deletions.
1 change: 0 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ omit=*.yml
yt/mods.py
yt/utilities/fits_image.py
yt/utilities/lodgeit.py
yt/visualization/_mpl_imports.py

ignore_errors = True
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ exclude = [
"*/__config__.py",
"yt/units",
"yt/frontends/stream/sample_data",
"yt/visualization/_mpl_imports.py",
"yt/utilities/fits_image.py",
"yt/utilities/lodgeit.py",
"yt/mods.py",
Expand Down
2 changes: 1 addition & 1 deletion yt/data_objects/tests/test_projection.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def teardown_func(fns):
pass


@mock.patch("yt.visualization._mpl_imports.FigureCanvasAgg.print_figure")
@mock.patch("matplotlib.backends.backend_agg.FigureCanvasAgg.print_figure")
def test_projection(pf):
fns = []
for nprocs in [8, 1]:
Expand Down
2 changes: 1 addition & 1 deletion yt/data_objects/tests/test_slice.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def teardown_func(fns):
pass


@mock.patch("yt.visualization._mpl_imports.FigureCanvasAgg.print_figure")
@mock.patch("matplotlib.backends.backend_agg.FigureCanvasAgg.print_figure")
def test_slice(pf):
fns = []
grid_eps = np.finfo(np.float64).eps
Expand Down
2 changes: 1 addition & 1 deletion yt/frontends/fits/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def save(self, name=None, mpl_kwargs=None):
self.pw.save(name=name, mpl_kwargs=mpl_kwargs)

def _repr_html_(self):
from yt.visualization._mpl_imports import FigureCanvasAgg
from matplotlib.backends.backend_agg import FigureCanvasAgg

ret = ""
for v in self.plots.values():
Expand Down
14 changes: 6 additions & 8 deletions yt/visualization/_commons.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from yt._maintenance.backports import zip

if TYPE_CHECKING:
from ._mpl_imports import FigureCanvasBase
from matplotlib.backend_bases import FigureCanvasBase


MPL_VERSION = Version(version("matplotlib"))
Expand All @@ -39,18 +39,16 @@


def _get_supported_image_file_formats():
from ._mpl_imports import FigureCanvasBase
from matplotlib.backend_bases import FigureCanvasBase

return frozenset(FigureCanvasBase.get_supported_filetypes().keys())


def _get_supported_canvas_classes():
from ._mpl_imports import (
FigureCanvasAgg,
FigureCanvasPdf,
FigureCanvasPS,
FigureCanvasSVG,
)
from matplotlib.backends.backend_agg import FigureCanvasAgg
from matplotlib.backends.backend_pdf import FigureCanvasPdf
from matplotlib.backends.backend_ps import FigureCanvasPS
from matplotlib.backends.backend_svg import FigureCanvasSVG

return frozenset(
(FigureCanvasAgg, FigureCanvasPdf, FigureCanvasPS, FigureCanvasSVG)
Expand Down
6 changes: 0 additions & 6 deletions yt/visualization/_mpl_imports.py

This file was deleted.

4 changes: 2 additions & 2 deletions yt/visualization/base_plot_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def _set_font_properties(self, font_properties, font_color):
label.set_color(font_color)

def _repr_png_(self):
from ._mpl_imports import FigureCanvasAgg
from matplotlib.backends.backend_agg import FigureCanvasAgg

canvas = FigureCanvasAgg(self.figure)
f = BytesIO()
Expand Down Expand Up @@ -593,6 +593,7 @@ def get_multi_plot(nx, ny, colorbar="vertical", bw=4, dpi=300, cbar_padding=0.4)
complicated or more specific sets of multiplots for your own purposes.
"""
import matplotlib.figure
from matplotlib.backends.backend_agg import FigureCanvasAgg

hf, wf = 1.0 / ny, 1.0 / nx
fudge_x = fudge_y = 1.0
Expand All @@ -605,7 +606,6 @@ def get_multi_plot(nx, ny, colorbar="vertical", bw=4, dpi=300, cbar_padding=0.4)
fudge_x = 1.0
fudge_y = ny / (cbar_padding + ny)
fig = matplotlib.figure.Figure((bw * nx / fudge_x, bw * ny / fudge_y), dpi=dpi)
from ._mpl_imports import FigureCanvasAgg

fig.set_canvas(FigureCanvasAgg(fig))
fig.subplots_adjust(
Expand Down
2 changes: 1 addition & 1 deletion yt/visualization/eps_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ def insert_image_yt(self, plot, field=None, pos=(0, 0), scale=1.0):
For best results, set use_colorbar=False when creating the yt
image.
"""
from ._mpl_imports import FigureCanvasAgg
from matplotlib.backends.backend_agg import FigureCanvasAgg

# We need to remove the colorbar (if necessary), remove the
# axes, and resize the figure to span the entire figure
Expand Down
20 changes: 10 additions & 10 deletions yt/visualization/tests/test_particle_plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,11 +268,11 @@ def test_particle_phase_plot(self):
particle_phases[0]._repr_html_()

with mock.patch(
"yt.visualization._mpl_imports.FigureCanvasAgg.print_figure"
"matplotlib.backends.backend_agg.FigureCanvasAgg.print_figure"
), mock.patch(
"yt.visualization._mpl_imports.FigureCanvasPdf.print_figure"
"matplotlib.backends.backend_pdf.FigureCanvasPdf.print_figure"
), mock.patch(
"yt.visualization._mpl_imports.FigureCanvasPS.print_figure"
"matplotlib.backends.backend_ps.FigureCanvasPS.print_figure"
):
for p in particle_phases:
for fname in TEST_FLNMS:
Expand Down Expand Up @@ -385,11 +385,11 @@ def test_particle_plot(self):
]
particle_projs[0]._repr_html_()
with mock.patch(
"yt.visualization._mpl_imports.FigureCanvasAgg.print_figure"
"matplotlib.backends.backend_agg.FigureCanvasAgg.print_figure"
), mock.patch(
"yt.visualization._mpl_imports.FigureCanvasPdf.print_figure"
"matplotlib.backends.backend_pdf.FigureCanvasPdf.print_figure"
), mock.patch(
"yt.visualization._mpl_imports.FigureCanvasPS.print_figure"
"matplotlib.backends.backend_ps.FigureCanvasPS.print_figure"
):
for p in particle_projs:
for fname in TEST_FLNMS:
Expand All @@ -403,7 +403,7 @@ def test_particle_plot_ds(self):
test_ds, dim, ("all", "particle_mass"), data_source=ds_region
)
with mock.patch(
"yt.visualization._mpl_imports.FigureCanvasAgg.print_figure"
"matplotlib.backends.backend_agg.FigureCanvasAgg.print_figure"
):
pplot_ds.save()

Expand All @@ -415,7 +415,7 @@ def test_particle_plot_c(self):
test_ds, dim, ("all", "particle_mass"), center=center
)
with mock.patch(
"yt.visualization._mpl_imports.FigureCanvasAgg.print_figure"
"matplotlib.backends.backend_agg.FigureCanvasAgg.print_figure"
):
pplot_c.save()

Expand All @@ -427,7 +427,7 @@ def test_particle_plot_wf(self):
test_ds, dim, ("all", "particle_mass"), weight_field=weight_field
)
with mock.patch(
"yt.visualization._mpl_imports.FigureCanvasAgg.print_figure"
"matplotlib.backends.backend_agg.FigureCanvasAgg.print_figure"
):
pplot_wf.save()

Expand All @@ -445,7 +445,7 @@ def test_particle_plot_offaxis(self):
weight_field=weight_field,
)
with mock.patch(
"yt.visualization._mpl_imports.FigureCanvasAgg.print_figure"
"matplotlib.backends.backend_agg.FigureCanvasAgg.print_figure"
):
pplot_off.save()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ def plot(self, fn=None, profile_field=None, profile_weight=None):
If fn is None, will return an image to an IPython notebook.
"""
from matplotlib.backends.backend_agg import FigureCanvasAgg
from matplotlib.figure import Figure

from yt.visualization._mpl_imports import FigureCanvasAgg

if self.tf is None:
self.build_transfer_function()
self.setup_default()
Expand Down

0 comments on commit 08d8f45

Please sign in to comment.