plotnine 0.15.0.dev2__tar.gz → 0.15.0.dev3__tar.gz

{plotnine-0.15.0.dev2/plotnine.egg-info → plotnine-0.15.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotnine
-Version: 0.15.0.dev2
+Version: 0.15.0.dev3
 Summary: A Grammar of Graphics for Python
 Author-email: Hassan Kibirige <has2k1@gmail.com>
 License: The MIT License (MIT)

{plotnine-0.15.0.dev2 → plotnine-0.15.0.dev3}/doc/_quartodoc.yml

@@ -38,6 +38,17 @@ quartodoc:
         - after_scale
         - stage
 
+    - subtitle: Functions in the Aesthetic Evaluation Environment
+      desc: |
+        The expressions you write in the `aes()` call are evaluated inside an
+        environment with a few functions that you may need from time to time.
+        These functions are for your convenience, and you can expect them to
+        to always be there.
+      package: plotnine.mapping._eval_environment
+      contents:
+        - factor
+        - reorder
+
     - title: Geoms
       desc: |
         Geometric objects (geoms) are responsible for the visual representation

{plotnine-0.15.0.dev2 → plotnine-0.15.0.dev3}/doc/changelog.qmd

@@ -68,12 +68,22 @@ title: Changelog
   )
   ```
 
+- Geoms [](:class:`~plotnine.geom_bar`) and [](:class:`~plotnine.geom_col`) have
+  gained new parameter `just` that controls how the bars align with the axis break point.
+
+- [](:class:`~plotnine.geom_sina`) has gained new parameter `style` just like
+  [](:class:`~plotnine.geom_violin`), which make one-sided (half) sina plots.
+
 ### Enhancements
 
 - Included datasets [](:attr:`~plotnine.data.mpg`), [](:attr:`~plotnine.data.msleep`) and
   [](:attr:`~plotnine.data.midwest`) no longer have any of their columns as categoricals.
   This matches the respective datasets in R. {{< issue 913 >}}
 
+- When the `width` of the violins in [](:class:`~plotnine.geom_violin`) is wider than their
+  normal area, they now overlap with those closest to the origin on top. This makes it possible
+  to create overlapping ridge plots using half violins.
+
 ### Bug Fixes
 
 - Fixed bug in with the `legend_key_height` themeable where it wasn't applied.
@@ -90,6 +100,7 @@ title: Changelog
 - Fixed bug where computed aesthetic from `after_scale` are were not applied to the legend.
   {{< issue 926 >}}
 
+- Fixed theming of minor x axis ticks.
 
 ## v0.14.5
 (2025-01-02)

{plotnine-0.15.0.dev2 → plotnine-0.15.0.dev3}/plotnine/_mpl/layout_manager/_layout_items.py

@@ -299,40 +299,6 @@ class LayoutItems:
 
         return chain(major, minor)
 
-    def axis_text_x_margin(self, ax: Axes) -> Iterator[float]:
-        """
-        Return XTicks paddings
-        """
-        # In plotnine tick padding are specified as a margin to the
-        # the axis_text.
-        major, minor = [], []
-        if not self._is_blank("axis_text_x"):
-            h = self.plot.figure.bbox.height
-            major = [
-                (t.get_pad() or 0) / h for t in ax.xaxis.get_major_ticks()
-            ]
-            minor = [
-                (t.get_pad() or 0) / h for t in ax.xaxis.get_minor_ticks()
-            ]
-        return chain(major, minor)
-
-    def axis_text_y_margin(self, ax: Axes) -> Iterator[float]:
-        """
-        Return YTicks paddings
-        """
-        # In plotnine tick padding are specified as a margin to the
-        # the axis_text.
-        major, minor = [], []
-        if not self._is_blank("axis_text_y"):
-            w = self.plot.figure.bbox.width
-            major = [
-                (t.get_pad() or 0) / w for t in ax.yaxis.get_major_ticks()
-            ]
-            minor = [
-                (t.get_pad() or 0) / w for t in ax.yaxis.get_minor_ticks()
-            ]
-        return chain(major, minor)
-
     def strip_text_x_height(self, position: StripPosition) -> float:
         """
         Height taken up by the top strips
@@ -377,10 +343,7 @@ class LayoutItems:
         Return maximum height[figure space] of x tick labels
         """
         heights = [
-            self.calc.tight_height(label) + pad
-            for label, pad in zip(
-                self.axis_text_x(ax), self.axis_text_x_margin(ax)
-            )
+            self.calc.tight_height(label) for label in self.axis_text_x(ax)
         ]
         return max(heights) if len(heights) else 0
 
@@ -410,10 +373,7 @@ class LayoutItems:
         Return maximum width[figure space] of y tick labels
         """
         widths = [
-            self.calc.tight_width(label) + pad
-            for label, pad in zip(
-                self.axis_text_y(ax), self.axis_text_y_margin(ax)
-            )
+            self.calc.tight_width(label) for label in self.axis_text_y(ax)
         ]
         return max(widths) if len(widths) else 0
 

{plotnine-0.15.0.dev2 → plotnine-0.15.0.dev3}/plotnine/_mpl/layout_manager/_layout_tree.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import abc
-from contextlib import suppress
 from dataclasses import dataclass
 from functools import cached_property
 from typing import TYPE_CHECKING
@@ -81,6 +80,13 @@ class LayoutTree:
     represents.
     """
 
+    @cached_property
+    def sub_compositions(self) -> list[LayoutTree]:
+        """
+        LayoutTrees of the direct sub compositions of this one
+        """
+        return [item for item in self.nodes if isinstance(item, LayoutTree)]
+
     @cached_property
     @abc.abstractmethod
     def lefts(self) -> Sequence[float]:
@@ -141,89 +147,54 @@ class LayoutTree:
         In figure dimenstions
         """
 
-    def align_lefts(self):
+    @abc.abstractmethod
+    def align(self):
         """
-        Align the immediate left edges in this composition
+        Align all the edges in this composition & contained compositions
 
-         -----------        -----------
-        |#          |      |  #        |
-        |#          |      |  #        |
-        |#          |      |  #        |
-        |-----------|  ->  |-----------|
-        |  #        |      |  #        |
-        |  #        |      |  #        |
-        |  #        |      |  #        |
-         -----------        -----------
+        This function mutates the layout spaces, specifically the
+        alignment_margins along the sides of the plot.
         """
 
-    def align_bottoms(self):
+    def align_sub_compositions(self):
         """
-        Align the immediate bottom edges this composition
-
-         -----------        -----------
-        |     |     |      |     |     |
-        |     |     |      |     |     |
-        |     |     |  ->  |     |     |
-        |     |#####|      |#####|#####|
-        |#####|     |      |     |     |
-         -----------        -----------
+        Align the compositions contained in this one
         """
+        # Recurse into the contained compositions
+        for tree in self.sub_compositions:
+            tree.align()
 
-    def align_rights(self):
+    @property
+    def bottoms_align(self) -> bool:
         """
-        Align the immediate right edges in this composition
-
-         -----------        -----------
-        |        #  |      |        #  |
-        |        #  |      |        #  |
-        |        #  |      |        #  |
-        |-----------|  ->  |-----------|
-        |          #|      |        #  |
-        |          #|      |        #  |
-        |          #|      |        #  |
-         -----------        -----------
+        Return True if panel bottoms for the nodes are aligned
         """
+        arr = np.array(self.bottoms)
+        return all(arr == arr[0])
 
-    def align_tops(self):
+    @property
+    def lefts_align(self) -> bool:
         """
-        Align the immediate top edges in this composition
-
-         -----------        -----------
-        |#####|     |      |     |     |
-        |     |#####|      |#####|#####|
-        |     |     |  ->  |     |     |
-        |     |     |      |     |     |
-        |     |     |      |     |     |
-         -----------        -----------
+        Return True if panel lefts for the nodes are aligned
         """
+        arr = np.array(self.lefts)
+        return all(arr == arr[0])
 
-    def align(self):
+    @property
+    def tops_align(self) -> bool:
         """
-        Align all the edges in this composition & contained compositions
-
-        This function mutates the layout spaces, specifically the
-        alignment_margins along the sides of the plot.
+        Return True if panel tops for the nodes are aligned
         """
-        self.align_lefts()
-        self.align_bottoms()
-        self.align_rights()
-        self.align_tops()
-
-        for item in self.nodes:
-            if isinstance(item, LayoutTree):
-                item.align()
-
-        with suppress(AttributeError):
-            del self.lefts
-
-        with suppress(AttributeError):
-            del self.bottoms
+        arr = np.array(self.tops)
+        return all(arr == arr[0])
 
-        with suppress(AttributeError):
-            del self.rights
-
-        with suppress(AttributeError):
-            del self.tops
+    @property
+    def rights_align(self) -> bool:
+        """
+        Return True if panel rights for the nodes are aligned
+        """
+        arr = np.array(self.rights)
+        return all(arr == arr[0])
 
     @property
     @abc.abstractmethod
@@ -288,22 +259,13 @@ class LayoutTree:
         This function mutates the composition gridspecs; specifically the
         width_ratios and height_ratios.
         """
-        self.resize_widths()
-        self.resize_heights()
 
-        for item in self.nodes:
-            if isinstance(item, LayoutTree):
-                item.resize()
-
-    def resize_widths(self):
+    def resize_sub_compositions(self):
         """
-        Resize the widths of gridspec so that panels have equal widths
-        """
-
-    def resize_heights(self):
-        """
-        Resize the heights of gridspec so that panels have equal heights
+        Resize panels in the compositions contained in this one
         """
+        for tree in self.sub_compositions:
+            tree.resize()
 
     @staticmethod
     def create(
@@ -368,6 +330,11 @@ class ColumnsTree(LayoutTree):
          -------------------
     """
 
+    def align(self):
+        self.align_tops()
+        self.align_bottoms()
+        self.align_sub_compositions()
+
     @cached_property
     def lefts(self):
         left_item = self.nodes[0]
@@ -383,14 +350,6 @@ class ColumnsTree(LayoutTree):
         else:
             left_item.set_left_alignment_margin(value)
 
-    def align_bottoms(self):
-        values = max(self.bottoms) - np.array(self.bottoms)
-        for item, value in zip(self.nodes, values):
-            if isinstance(item, LayoutSpaces):
-                item.b.alignment_margin = value
-            else:
-                item.set_bottom_alignment_margin(value)
-
     @cached_property
     def bottoms(self):
         values = []
@@ -401,6 +360,33 @@ class ColumnsTree(LayoutTree):
                 values.append(max(item.bottoms))
         return values
 
+    def align_bottoms(self):
+        """
+        Align the immediate bottom edges this composition
+
+         -----------        -----------
+        |     |     |      |     |     |
+        |     |     |      |     |     |
+        |     |     |  ->  |     |     |
+        |     |#####|      |#####|#####|
+        |#####|     |      |     |     |
+         -----------        -----------
+        """
+        # If panels are aligned and have a non-zero alignment_margin,
+        # aligning them again will set that value to zero and undoes
+        # the alignment.
+        if self.bottoms_align:
+            return
+
+        values = max(self.bottoms) - np.array(self.bottoms)
+        for item, value in zip(self.nodes, values):
+            if isinstance(item, LayoutSpaces):
+                item.b.alignment_margin = value
+            else:
+                item.set_bottom_alignment_margin(value)
+
+        del self.bottoms
+
     def set_bottom_alignment_margin(self, value: float):
         for item in self.nodes:
             if isinstance(item, LayoutSpaces):
@@ -423,14 +409,6 @@ class ColumnsTree(LayoutTree):
         else:
             right_item.set_right_alignment_margin(value)
 
-    def align_tops(self):
-        values = np.array(self.tops) - min(self.tops)
-        for item, value in zip(self.nodes, values):
-            if isinstance(item, LayoutSpaces):
-                item.t.alignment_margin = value
-            else:
-                item.set_top_alignment_margin(value)
-
     @cached_property
     def tops(self):
         values = []
@@ -441,6 +419,30 @@ class ColumnsTree(LayoutTree):
                 values.append(min(item.tops))
         return values
 
+    def align_tops(self):
+        """
+        Align the immediate top edges in this composition
+
+         -----------        -----------
+        |#####|     |      |     |     |
+        |     |#####|      |#####|#####|
+        |     |     |  ->  |     |     |
+        |     |     |      |     |     |
+        |     |     |      |     |     |
+         -----------        -----------
+        """
+        if self.tops_align:
+            return
+
+        values = np.array(self.tops) - min(self.tops)
+        for item, value in zip(self.nodes, values):
+            if isinstance(item, LayoutSpaces):
+                item.t.alignment_margin = value
+            else:
+                item.set_top_alignment_margin(value)
+
+        del self.tops
+
     def set_top_alignment_margin(self, value: float):
         for item in self.nodes:
             if isinstance(item, LayoutSpaces):
@@ -476,7 +478,10 @@ class ColumnsTree(LayoutTree):
         """
         return max(self.plot_heights)
 
-    def resize_widths(self):
+    def resize(self):
+        """
+        Resize the widths of gridspec so that panels have equal widths
+        """
         # The new width of each panel is the average width of all
         # the panels plus all the space to the left and right
         # of the panels.
@@ -486,6 +491,7 @@ class ColumnsTree(LayoutTree):
         new_plot_widths = panel_widths.mean() + non_panel_space
         width_ratios = new_plot_widths / new_plot_widths.min()
         self.gridspec.set_width_ratios(width_ratios)
+        self.resize_sub_compositions()
 
 
 @dataclass
@@ -506,13 +512,10 @@ class RowsTree(LayoutTree):
          -------------------
     """
 
-    def align_lefts(self):
-        values = max(self.lefts) - np.array(self.lefts)
-        for item, value in zip(self.nodes, values):
-            if isinstance(item, LayoutSpaces):
-                item.l.alignment_margin = value
-            else:
-                item.set_left_alignment_margin(value)
+    def align(self):
+        self.align_lefts()
+        self.align_rights()
+        self.align_sub_compositions()
 
     @cached_property
     def lefts(self):
@@ -524,6 +527,32 @@ class RowsTree(LayoutTree):
                 values.append(max(item.lefts))
         return values
 
+    def align_lefts(self):
+        """
+        Align the immediate left edges in this composition
+
+         -----------        -----------
+        |#          |      |  #        |
+        |#          |      |  #        |
+        |#          |      |  #        |
+        |-----------|  ->  |-----------|
+        |  #        |      |  #        |
+        |  #        |      |  #        |
+        |  #        |      |  #        |
+         -----------        -----------
+        """
+        if self.lefts_align:
+            return
+
+        values = max(self.lefts) - np.array(self.lefts)
+        for item, value in zip(self.nodes, values):
+            if isinstance(item, LayoutSpaces):
+                item.l.alignment_margin = value
+            else:
+                item.set_left_alignment_margin(value)
+
+        del self.lefts
+
     def set_left_alignment_margin(self, value: float):
         for item in self.nodes:
             if isinstance(item, LayoutSpaces):
@@ -546,14 +575,6 @@ class RowsTree(LayoutTree):
         else:
             bottom_item.set_bottom_alignment_margin(value)
 
-    def align_rights(self):
-        values = np.array(self.rights) - min(self.rights)
-        for item, value in zip(self.nodes, values):
-            if isinstance(item, LayoutSpaces):
-                item.r.alignment_margin = value
-            else:
-                item.set_right_alignment_margin(value)
-
     @cached_property
     def rights(self):
         values = []
@@ -564,6 +585,32 @@ class RowsTree(LayoutTree):
                 values.append(min(item.rights))
         return values
 
+    def align_rights(self):
+        """
+        Align the immediate right edges in this composition
+
+         -----------        -----------
+        |        #  |      |        #  |
+        |        #  |      |        #  |
+        |        #  |      |        #  |
+        |-----------|  ->  |-----------|
+        |          #|      |        #  |
+        |          #|      |        #  |
+        |          #|      |        #  |
+         -----------        -----------
+        """
+        if self.rights_align:
+            return
+
+        values = np.array(self.rights) - min(self.rights)
+        for item, value in zip(self.nodes, values):
+            if isinstance(item, LayoutSpaces):
+                item.r.alignment_margin = value
+            else:
+                item.set_right_alignment_margin(value)
+
+        del self.rights
+
     def set_right_alignment_margin(self, value: float):
         for item in self.nodes:
             if isinstance(item, LayoutSpaces):
@@ -614,8 +661,13 @@ class RowsTree(LayoutTree):
         """
         return sum(self.plot_heights)
 
-    def resize_heights(self):
-        # The new width of each panel is the average width of all
+    def resize(self):
+        """
+        Resize the heights of gridspec so that panels have equal heights
+
+        This method resizes (recursively) the contained compositions
+        """
+        # The new height of each panel is the average width of all
         # the panels plus all the space above and below the panels.
         plot_heights = np.array(self.plot_heights)
         panel_heights = np.array(self.panel_heights)
@@ -623,3 +675,4 @@ class RowsTree(LayoutTree):
         new_plot_heights = panel_heights.mean() + non_panel_space
         height_ratios = new_plot_heights / new_plot_heights.max()
         self.gridspec.set_height_ratios(height_ratios)
+        self.resize_sub_compositions()

{plotnine-0.15.0.dev2 → plotnine-0.15.0.dev3}/plotnine/_mpl/layout_manager/_spaces.py

@@ -222,7 +222,9 @@ class left_spaces(_side_spaces):
     axis_title_y_margin_left: float = 0
     axis_title_y: float = 0
     axis_title_y_margin_right: float = 0
+    axis_text_y_margin_left: float = 0
     axis_text_y: float = 0
+    axis_text_y_margin_right: float = 0
     axis_ticks_y: float = 0
 
     def _calculate(self):
@@ -256,6 +258,11 @@ class left_spaces(_side_spaces):
 
         # Account for the space consumed by the axis
         self.axis_text_y = items.axis_text_y_max_width_at("first_col")
+        if self.axis_text_y:
+            m = theme.get_margin("axis_text_y").fig
+            self.axis_text_y_margin_left = m.l
+            self.axis_text_y_margin_right = m.r
+
         self.axis_ticks_y = items.axis_ticks_y_max_width_at("first_col")
 
         # Adjust plot_margin to make room for ylabels that protude well
@@ -576,7 +583,9 @@ class bottom_spaces(_side_spaces):
     axis_title_x_margin_bottom: float = 0
     axis_title_x: float = 0
     axis_title_x_margin_top: float = 0
+    axis_text_x_margin_bottom: float = 0
     axis_text_x: float = 0
+    axis_text_x_margin_top: float = 0
     axis_ticks_x: float = 0
 
     def _calculate(self):
@@ -616,8 +625,12 @@ class bottom_spaces(_side_spaces):
             self.axis_title_x_margin_top = m.t * F
 
         # Account for the space consumed by the axis
-        self.axis_ticks_x = items.axis_ticks_x_max_height_at("last_row")
         self.axis_text_x = items.axis_text_x_max_height_at("last_row")
+        if self.axis_text_x:
+            m = theme.get_margin("axis_text_x").fig
+            self.axis_text_x_margin_bottom = m.b
+            self.axis_text_x_margin_top = m.t
+        self.axis_ticks_x = items.axis_ticks_x_max_height_at("last_row")
 
         # Adjust plot_margin to make room for ylabels that protude well
         # beyond the axes
@@ -736,7 +749,7 @@ class LayoutSpaces:
     sw: float = field(init=False, default=0)
     """vertical spacing btn panels w.r.t figure"""
 
-    gsparams: GridSpecParams = field(init=False)
+    gsparams: GridSpecParams = field(init=False, repr=False)
     """Grid spacing btn panels w.r.t figure"""
 
     def __post_init__(self):

{plotnine-0.15.0.dev2 → plotnine-0.15.0.dev3}/plotnine/geoms/geom_bar.py

@@ -20,6 +20,11 @@ class geom_bar(geom_rect):
     Parameters
     ----------
     {common_parameters}
+    just : float, default=0.5
+        How to align the column with respect to the axis breaks. The default
+        `0.5` aligns the center of the column with the break. `0` aligns the
+        left of the of the column with the break and `1` aligns the right of
+        the column with the break.
     width : float, default=None
         Bar width. If `None`{.py}, the width is set to
         `90%` of the resolution of the data.
@@ -35,6 +40,7 @@ class geom_bar(geom_rect):
         "stat": "count",
         "position": "stack",
         "na_rm": False,
+        "just": 0.5,
         "width": None,
     }
 
@@ -45,6 +51,8 @@ class geom_bar(geom_rect):
             else:
                 data["width"] = resolution(data["x"], False) * 0.9
 
+        just = self.params.get("just", 0.5)
+
         bool_idx = data["y"] < 0
 
         data["ymin"] = 0.0
@@ -53,7 +61,7 @@ class geom_bar(geom_rect):
         data["ymax"] = data["y"]
         data.loc[bool_idx, "ymax"] = 0.0
 
-        data["xmin"] = data["x"] - data["width"] / 2
-        data["xmax"] = data["x"] + data["width"] / 2
+        data["xmin"] = data["x"] - data["width"] * just
+        data["xmax"] = data["x"] + data["width"] * (1 - just)
         del data["width"]
         return data

{plotnine-0.15.0.dev2 → plotnine-0.15.0.dev3}/plotnine/geoms/geom_col.py

@@ -17,6 +17,11 @@ class geom_col(geom_bar):
     Parameters
     ----------
     {common_parameters}
+    just : float, default=0.5
+        How to align the column with respect to the axis breaks. The default
+        `0.5` aligns the center of the column with the break. `0` aligns the
+        left of the of the column with the break and `1` aligns the right of
+        the column with the break.
     width : float, default=None
         Bar width. If `None`{.py}, the width is set to
         `90%` of the resolution of the data.
@@ -32,5 +37,6 @@ class geom_col(geom_bar):
         "stat": "identity",
         "position": "stack",
         "na_rm": False,
+        "just": 0.5,
         "width": None,
     }