Quick fix for matplotlib 3.10.* compatability

Author: Mr-Milk

src/marsilea/__init__.py

@@ -1,6 +1,6 @@
 """Declarative creation of composable visualization"""
 
-__version__ = "0.4.7"
+__version__ = "0.4.8"
 
 import marsilea.plotter as plotter
 from ._deform import Deformation

src/marsilea/base.py

@@ -169,7 +169,14 @@ def _legends_drawer(self, ax):
         for _, legs in legends.items():
             for leg in legs:
                 try:
+                    # Try to detach legend from figure
                     leg.remove()
+                    # For matplotlib >= 3.10.0
+                    if hasattr(leg, "_parent_figure"):
+                        setattr(leg, "_parent_figure", None)
+                    # For matplotlib < 3.10.0
+                    if hasattr(leg, "figure"):
+                        setattr(leg, "figure", None)
                 except Exception:
                     pass
 

src/marsilea/plotter/arc.py

@@ -231,11 +231,9 @@ def render_ax(self, spec):
             ax.set_ylim(lim * 1.1, 0)
             ax.set_xlim(0, 1)
         if self.side == "top":
-            if not ax.yaxis_inverted():
-                ax.invert_yaxis()
+            ax.invert_yaxis()
         if self.side == "left":
-            if not ax.xaxis_inverted():
-                ax.invert_xaxis()
+            ax.invert_xaxis()
         ax.set_axis_off()
 
     def get_legends(self):

src/marsilea/plotter/area.py

@@ -90,8 +90,7 @@ def render_ax(self, spec):
                 ax.plot(data, x, **line_options)
             ax.set_ylim(-0.5, len(data) - 0.5)
             if self.side == "left":
-                if not ax.xaxis_inverted():
-                    ax.invert_xaxis()
+                ax.invert_xaxis()
         else:
             ax.fill_between(x, data, **fill_options)
             if self.add_outline:

src/marsilea/plotter/bar.py

@@ -270,8 +270,7 @@ def render_ax(self, spec):
             ax.xaxis.set_major_formatter(FuncFormatter(lambda x, p: f"{np.abs(x):g}"))
 
         if self.is_flank:
-            if not ax.yaxis_inverted():
-                ax.invert_yaxis()
+            ax.invert_yaxis()
 
         if self.show_value:
             left_label = _format_labels(left_bar, self.fmt)

src/marsilea/plotter/bio.py

@@ -171,12 +171,9 @@ def render_ax(self, spec):
             ax.set_xlim(0, lim)
             ax.set_ylim(0, data.shape[1])
         if self.is_flank:
-            if not ax.yaxis_inverted():
-                ax.invert_yaxis()
+            ax.invert_yaxis()
         if self.side == "left":
-            if not ax.xaxis_inverted():
-                ax.invert_xaxis()
+            ax.invert_xaxis()
         if self.side == "bottom":
-            if not ax.yaxis_inverted():
-                ax.invert_yaxis()
+            ax.invert_yaxis()
         ax.set_axis_off()

src/marsilea/plotter/range.py

@@ -125,8 +125,7 @@ def render_ax(self, spec: RenderSpec):
         else:
             ax.set_xlim(0, len(data))
         if self.side == "left":
-            if not ax.xaxis_inverted():
-                ax.invert_xaxis()
+            ax.invert_xaxis()
 
     def get_legends(self):
         return [

src/marsilea/upset.py

@@ -947,7 +947,7 @@ def _render_matrix(self, ax):
     def _extra_legends(self):
         handles = [Patch(**entry) for entry in self._legend_entries]
         highlight_legend = ListLegend(handles=handles, handlelength=2)
-        highlight_legend.figure = None
+        # highlight_legend.set_figure(None)
         return {"highlight_subsets": [highlight_legend]}
 
     def render(self, figure=None, scale=1):