Formatting and add black[jupyter] to deps

Author: max-models

pyproject.toml

@@ -36,7 +36,7 @@ docs = [
 dev = [
     "maxplotlibx[test,docs]",
     "ruff",
-    "black",
+    "black[jupyter]",
     "isort",
     "jupyterlab",
     "nbstripout",

src/maxplotlib/canvas/canvas.py

@@ -384,19 +384,27 @@ def set_title(self, title: str, row: int | None = None, col: int | None = None):
         """Set the title for a subplot (default top-left)."""
         self._get_or_create_subplot(row, col).set_title(title)
 
-    def set_xlim(self, left=None, right=None, row: int | None = None, col: int | None = None):
+    def set_xlim(
+        self, left=None, right=None, row: int | None = None, col: int | None = None
+    ):
         """Set the x-axis limits for a subplot (default top-left)."""
         self._get_or_create_subplot(row, col).set_xlim(left, right)
 
-    def set_ylim(self, bottom=None, top=None, row: int | None = None, col: int | None = None):
+    def set_ylim(
+        self, bottom=None, top=None, row: int | None = None, col: int | None = None
+    ):
         """Set the y-axis limits for a subplot (default top-left)."""
         self._get_or_create_subplot(row, col).set_ylim(bottom, top)
 
-    def set_grid(self, visible: bool = True, row: int | None = None, col: int | None = None):
+    def set_grid(
+        self, visible: bool = True, row: int | None = None, col: int | None = None
+    ):
         """Show or hide the grid for a subplot (default top-left)."""
         self._get_or_create_subplot(row, col).set_grid(visible)
 
-    def set_legend(self, visible: bool = True, row: int | None = None, col: int | None = None):
+    def set_legend(
+        self, visible: bool = True, row: int | None = None, col: int | None = None
+    ):
         """Show or hide the legend for a subplot (default top-left)."""
         self._get_or_create_subplot(row, col).set_legend(visible)
 
@@ -408,43 +416,109 @@ def set_yscale(self, scale: str, row: int | None = None, col: int | None = None)
         """Set y-axis scale ('linear', 'log', 'symlog') for a subplot."""
         self._get_or_create_subplot(row, col).set_yscale(scale)
 
-    def set_xticks(self, ticks, labels=None, row: int | None = None, col: int | None = None):
+    def set_xticks(
+        self, ticks, labels=None, row: int | None = None, col: int | None = None
+    ):
         """Set x-axis tick positions (and optional labels) for a subplot."""
         self._get_or_create_subplot(row, col).set_xticks(ticks, labels)
 
-    def set_yticks(self, ticks, labels=None, row: int | None = None, col: int | None = None):
+    def set_yticks(
+        self, ticks, labels=None, row: int | None = None, col: int | None = None
+    ):
         """Set y-axis tick positions (and optional labels) for a subplot."""
         self._get_or_create_subplot(row, col).set_yticks(ticks, labels)
 
-    def fill_between(self, x, y1, y2=0, layer=0, row: int | None = None, col: int | None = None, **kwargs):
+    def fill_between(
+        self,
+        x,
+        y1,
+        y2=0,
+        layer=0,
+        row: int | None = None,
+        col: int | None = None,
+        **kwargs,
+    ):
         """Fill the region between two curves on a subplot."""
-        self._get_or_create_subplot(row, col).fill_between(x, y1, y2, layer=layer, **kwargs)
+        self._get_or_create_subplot(row, col).fill_between(
+            x, y1, y2, layer=layer, **kwargs
+        )
 
-    def errorbar(self, x, y, yerr=None, xerr=None, layer=0, row: int | None = None, col: int | None = None, **kwargs):
+    def errorbar(
+        self,
+        x,
+        y,
+        yerr=None,
+        xerr=None,
+        layer=0,
+        row: int | None = None,
+        col: int | None = None,
+        **kwargs,
+    ):
         """Add an error-bar line to a subplot."""
-        self._get_or_create_subplot(row, col).errorbar(x, y, yerr=yerr, xerr=xerr, layer=layer, **kwargs)
+        self._get_or_create_subplot(row, col).errorbar(
+            x, y, yerr=yerr, xerr=xerr, layer=layer, **kwargs
+        )
 
-    def axhline(self, y=0, layer=0, row: int | None = None, col: int | None = None, **kwargs):
+    def axhline(
+        self, y=0, layer=0, row: int | None = None, col: int | None = None, **kwargs
+    ):
         """Add a full-width horizontal reference line to a subplot."""
         self._get_or_create_subplot(row, col).axhline(y=y, layer=layer, **kwargs)
 
-    def axvline(self, x=0, layer=0, row: int | None = None, col: int | None = None, **kwargs):
+    def axvline(
+        self, x=0, layer=0, row: int | None = None, col: int | None = None, **kwargs
+    ):
         """Add a full-height vertical reference line to a subplot."""
         self._get_or_create_subplot(row, col).axvline(x=x, layer=layer, **kwargs)
 
-    def hlines(self, y, xmin, xmax, layer=0, row: int | None = None, col: int | None = None, **kwargs):
+    def hlines(
+        self,
+        y,
+        xmin,
+        xmax,
+        layer=0,
+        row: int | None = None,
+        col: int | None = None,
+        **kwargs,
+    ):
         """Add horizontal lines at specified y positions to a subplot."""
-        self._get_or_create_subplot(row, col).hlines(y, xmin, xmax, layer=layer, **kwargs)
+        self._get_or_create_subplot(row, col).hlines(
+            y, xmin, xmax, layer=layer, **kwargs
+        )
 
-    def vlines(self, x, ymin, ymax, layer=0, row: int | None = None, col: int | None = None, **kwargs):
+    def vlines(
+        self,
+        x,
+        ymin,
+        ymax,
+        layer=0,
+        row: int | None = None,
+        col: int | None = None,
+        **kwargs,
+    ):
         """Add vertical lines at specified x positions to a subplot."""
-        self._get_or_create_subplot(row, col).vlines(x, ymin, ymax, layer=layer, **kwargs)
+        self._get_or_create_subplot(row, col).vlines(
+            x, ymin, ymax, layer=layer, **kwargs
+        )
 
-    def annotate(self, text, xy, xytext=None, layer=0, row: int | None = None, col: int | None = None, **kwargs):
+    def annotate(
+        self,
+        text,
+        xy,
+        xytext=None,
+        layer=0,
+        row: int | None = None,
+        col: int | None = None,
+        **kwargs,
+    ):
         """Add an annotation (with optional arrow) to a subplot."""
-        self._get_or_create_subplot(row, col).annotate(text, xy, xytext=xytext, layer=layer, **kwargs)
+        self._get_or_create_subplot(row, col).annotate(
+            text, xy, xytext=xytext, layer=layer, **kwargs
+        )
 
-    def text(self, x, y, s, layer=0, row: int | None = None, col: int | None = None, **kwargs):
+    def text(
+        self, x, y, s, layer=0, row: int | None = None, col: int | None = None, **kwargs
+    ):
         """Add a text label at (x, y) on a subplot."""
         self._get_or_create_subplot(row, col).text(x, y, s, layer=layer, **kwargs)
 

src/maxplotlib/subfigure/line_plot.py

@@ -465,8 +465,16 @@ def plot_matplotlib(
                 elif line["plot_type"] == "fill_between":
                     ax.fill_between(
                         (line["x"] + self._xshift) * self._xscale,
-                        line["y1"] if np.isscalar(line["y1"]) else (line["y1"] + self._yshift) * self._yscale,
-                        line["y2"] if np.isscalar(line["y2"]) else (line["y2"] + self._yshift) * self._yscale,
+                        (
+                            line["y1"]
+                            if np.isscalar(line["y1"])
+                            else (line["y1"] + self._yshift) * self._yscale
+                        ),
+                        (
+                            line["y2"]
+                            if np.isscalar(line["y2"])
+                            else (line["y2"] + self._yshift) * self._yscale
+                        ),
                         **line["kwargs"],
                     )
                 elif line["plot_type"] == "errorbar":
@@ -645,5 +653,7 @@ def legend(self, value):
 if __name__ == "__main__":
     plotter = LinePlot(xlabel="x", ylabel="y", title="Example", legend=True)
     plotter.plot([0, 1, 2, 3], [0, 1, 4, 9], label="Line 1")
-    plotter.plot([0, 1, 2, 3], [0, 2, 3, 6], linestyle="dashed", color="red", label="Line 2")
+    plotter.plot(
+        [0, 1, 2, 3], [0, 2, 3, 6], linestyle="dashed", color="red", label="Line 2"
+    )
     plotter.scatter([0, 1, 2, 3], [0, 0.5, 2, 5], label="Scatter")

tutorials/tutorial_01.ipynb

@@ -74,13 +74,20 @@
    "source": [
     "canvas, ax = Canvas.subplots()\n",
     "\n",
-    "ax.plot(x, np.sin(x),   label='sin(x)',  color='royalblue',  linestyle='solid',  linewidth=2)\n",
-    "ax.plot(x, np.cos(x),   label='cos(x)',  color='tomato',     linestyle='dashed', linewidth=2)\n",
-    "ax.plot(x, np.sin(2*x), label='sin(2x)', color='forestgreen',linestyle='dotted', linewidth=1.5)\n",
+    "ax.plot(x, np.sin(x), label=\"sin(x)\", color=\"royalblue\", linestyle=\"solid\", linewidth=2)\n",
+    "ax.plot(x, np.cos(x), label=\"cos(x)\", color=\"tomato\", linestyle=\"dashed\", linewidth=2)\n",
+    "ax.plot(\n",
+    "    x,\n",
+    "    np.sin(2 * x),\n",
+    "    label=\"sin(2x)\",\n",
+    "    color=\"forestgreen\",\n",
+    "    linestyle=\"dotted\",\n",
+    "    linewidth=1.5,\n",
+    ")\n",
     "\n",
-    "ax.set_xlabel('x')\n",
-    "ax.set_ylabel('y')\n",
-    "ax.set_title('Sine and Cosine')\n",
+    "ax.set_xlabel(\"x\")\n",
+    "ax.set_ylabel(\"y\")\n",
+    "ax.set_title(\"Sine and Cosine\")\n",
     "ax.set_legend(True)\n",
     "\n",
     "canvas.show()"
@@ -106,12 +113,12 @@
    "source": [
     "canvas = Canvas(ratio=0.5, fontsize=12)\n",
     "\n",
-    "canvas.add_line(x, np.sin(x), label='sin(x)',  color='steelblue')\n",
-    "canvas.add_line(x, np.cos(x), label='cos(x)',  color='darkorange', linestyle='dashed')\n",
+    "canvas.add_line(x, np.sin(x), label=\"sin(x)\", color=\"steelblue\")\n",
+    "canvas.add_line(x, np.cos(x), label=\"cos(x)\", color=\"darkorange\", linestyle=\"dashed\")\n",
     "\n",
-    "canvas.set_xlabel('angle (rad)')\n",
-    "canvas.set_ylabel('amplitude')\n",
-    "canvas.set_title('Using canvas-level methods')\n",
+    "canvas.set_xlabel(\"angle (rad)\")\n",
+    "canvas.set_ylabel(\"amplitude\")\n",
+    "canvas.set_title(\"Using canvas-level methods\")\n",
     "canvas.set_legend(True)\n",
     "canvas.set_grid(True)\n",
     "\n",
@@ -138,15 +145,15 @@
    "source": [
     "canvas = Canvas(ratio=0.5)\n",
     "ax = canvas.add_subplot(\n",
-    "    title='Configured at creation',\n",
-    "    xlabel='x',\n",
-    "    ylabel='f(x)',\n",
+    "    title=\"Configured at creation\",\n",
+    "    xlabel=\"x\",\n",
+    "    ylabel=\"f(x)\",\n",
     "    grid=True,\n",
     "    legend=True,\n",
     ")\n",
     "\n",
-    "ax.plot(x, np.sin(x),    label='sin',  color='royalblue')\n",
-    "ax.plot(x, x / (2*np.pi), label='x/2π', color='coral', linestyle='dashed')\n",
+    "ax.plot(x, np.sin(x), label=\"sin\", color=\"royalblue\")\n",
+    "ax.plot(x, x / (2 * np.pi), label=\"x/2π\", color=\"coral\", linestyle=\"dashed\")\n",
     "\n",
     "canvas.show()"
    ]
@@ -170,11 +177,11 @@
    "outputs": [],
    "source": [
     "canvas = Canvas(ratio=0.5)\n",
-    "ax = canvas.add_subplot(xlabel='x', ylabel='sin(x)', grid=True)\n",
-    "ax.plot(x, np.sin(x), color='steelblue')\n",
+    "ax = canvas.add_subplot(xlabel=\"x\", ylabel=\"sin(x)\", grid=True)\n",
+    "ax.plot(x, np.sin(x), color=\"steelblue\")\n",
     "\n",
-    "canvas.savefig('tutorial_01_output.png')\n",
-    "print('Figure saved to tutorial_01_output.png')"
+    "canvas.savefig(\"tutorial_01_output.png\")\n",
+    "print(\"Figure saved to tutorial_01_output.png\")"
    ]
   },
   {