plotnine 0.15.0a1__py3-none-any.whl → 0.15.0a3__py3-none-any.whl

plotnine/stats/stat_smooth.py

@@ -37,7 +37,7 @@ class stat_smooth(stat):
         If a `callable` is passed, it must have the signature:
 
         ```python
-        def my_smoother(data, xseq, **params):
+        def my_smoother(data, xseq, params):
             # * data - has the x and y values for the model
             # * xseq - x values to be predicted
             # * params - stat parameters
@@ -163,7 +163,7 @@ class stat_smooth(stat):
         return data
 
     def setup_params(self, data):
-        params = self.params.copy()
+        params = self.params
         # Use loess/lowess for small datasets
         # and glm for large
         if params["method"] == "auto":
@@ -202,12 +202,9 @@ class stat_smooth(stat):
                 )
             params["environment"] = self.environment
 
-        return params
-
-    @classmethod
-    def compute_group(cls, data, scales, **params):
+    def compute_group(self, data, scales):
         data = data.sort_values("x")
-        n = params["n"]
+        n = self.params["n"]
 
         x_unique = data["x"].unique()
 
@@ -223,15 +220,15 @@ class stat_smooth(stat):
             return pd.DataFrame()
 
         if data["x"].dtype.kind == "i":
-            if params["fullrange"]:
+            if self.params["fullrange"]:
                 xseq = scales.x.dimension()
             else:
                 xseq = np.sort(x_unique)
         else:
-            if params["fullrange"]:
+            if self.params["fullrange"]:
                 rangee = scales.x.dimension()
             else:
                 rangee = [data["x"].min(), data["x"].max()]
             xseq = np.linspace(rangee[0], rangee[1], n)
 
-        return predictdf(data, xseq, **params)
+        return predictdf(data, xseq, self.params)

plotnine/stats/stat_sum.py

@@ -35,8 +35,7 @@ class stat_sum(stat):
     DEFAULT_AES = {"size": after_stat("n"), "weight": 1}
     CREATES = {"n", "prop"}
 
-    @classmethod
-    def compute_panel(cls, data, scales, **params):
+    def compute_panel(self, data, scales):
         if "weight" not in data:
             data["weight"] = 1
 

plotnine/stats/stat_summary.py

@@ -299,16 +299,13 @@ class stat_summary(stat):
 
             self.params["fun_args"]["random_state"] = random_state
 
-        return self.params
-
-    @classmethod
-    def compute_panel(cls, data, scales, **params):
+    def compute_panel(self, data, scales):
         func = make_summary_fun(
-            params["fun_data"],
-            params["fun_y"],
-            params["fun_ymin"],
-            params["fun_ymax"],
-            params["fun_args"],
+            self.params["fun_data"],
+            self.params["fun_y"],
+            self.params["fun_ymin"],
+            self.params["fun_ymax"],
+            self.params["fun_args"],
         )
 
         # break a dataframe into pieces, summarise each piece,

plotnine/stats/stat_summary_bin.py

@@ -123,21 +123,18 @@ class stat_summary_bin(stat):
 
             self.params["fun_args"]["random_state"] = random_state
 
-        return self.params
-
-    @classmethod
-    def compute_group(cls, data, scales, **params):
-        bins = params["bins"]
-        breaks = params["breaks"]
-        binwidth = params["binwidth"]
-        boundary = params["boundary"]
+    def compute_group(self, data, scales):
+        bins = self.params["bins"]
+        breaks = self.params["breaks"]
+        binwidth = self.params["binwidth"]
+        boundary = self.params["boundary"]
 
         func = make_summary_fun(
-            params["fun_data"],
-            params["fun_y"],
-            params["fun_ymin"],
-            params["fun_ymax"],
-            params["fun_args"],
+            self.params["fun_data"],
+            self.params["fun_y"],
+            self.params["fun_ymin"],
+            self.params["fun_ymax"],
+            self.params["fun_args"],
         )
 
         breaks = fuzzybreaks(scales.x, breaks, boundary, binwidth, bins)

plotnine/stats/stat_unique.py

@@ -16,6 +16,5 @@ class stat_unique(stat):
 
     DEFAULT_PARAMS = {"geom": "point", "position": "identity", "na_rm": False}
 
-    @classmethod
-    def compute_panel(cls, data, scales, **params):
+    def compute_panel(self, data, scales):
         return data.drop_duplicates()

plotnine/stats/stat_ydensity.py

@@ -109,7 +109,7 @@ class stat_ydensity(stat):
         return data
 
     def setup_params(self, data):
-        params = self.params.copy()
+        params = self.params
 
         valid_scale = ("area", "count", "width")
         if params["scale"] not in valid_scale:
@@ -141,11 +141,9 @@ class stat_ydensity(stat):
         for key in missing_params:
             params[key] = stat_density.DEFAULT_PARAMS[key]
 
-        return params
-
-    @classmethod
-    def compute_panel(cls, data, scales, **params):
-        data = super(cls, cls).compute_panel(data, scales, **params)
+    def compute_panel(self, data, scales):
+        params = self.params
+        data = super().compute_panel(data, scales)
 
         if not len(data):
             return data
@@ -167,20 +165,19 @@ class stat_ydensity(stat):
 
         return data
 
-    @classmethod
-    def compute_group(cls, data, scales, **params):
+    def compute_group(self, data, scales):
         n = len(data)
         if n == 0:
             return pd.DataFrame()
 
         weight = data.get("weight")
 
-        if params["trim"]:
+        if self.params["trim"]:
             range_y = data["y"].min(), data["y"].max()
         else:
             range_y = scales.y.dimension()
 
-        dens = compute_density(data["y"], weight, range_y, **params)
+        dens = compute_density(data["y"], weight, range_y, self.params)
 
         if not len(dens):
             return dens

plotnine/themes/elements/__init__.py

@@ -2,7 +2,7 @@ from .element_blank import element_blank
 from .element_line import element_line
 from .element_rect import element_rect
 from .element_text import element_text
-from .margin import margin
+from .margin import margin, margin_auto
 
 __all__ = (
     "element_blank",
@@ -10,4 +10,5 @@ __all__ = (
     "element_rect",
     "element_text",
     "margin",
+    "margin_auto",
 )

plotnine/themes/elements/margin.py

@@ -1,5 +1,5 @@
 """
-Theme elements used to decorate the graph.
+Margin
 """
 
 from __future__ import annotations
@@ -17,17 +17,55 @@ if TYPE_CHECKING:
 
 @dataclass
 class margin:
+    """
+    Margin
+    """
+
     t: float = 0
+    """
+    Top margin
+    """
+
     r: float = 0
+    """
+    Right margin
+    """
+
     b: float = 0
+    """
+    Bottom margin
+    """
+
     l: float = 0
+    """
+    Left Margin
+    """
+
     unit: Literal["pt", "in", "lines", "fig"] = "pt"
+    """
+    The units (coordinate space) of the values
+    """
 
     # These are set by the themeable when it is applied
     fontsize: float = field(init=False, default=0)
+    """
+    Font size of text that this margin applies to
+    """
+
     figure_size: tuple[float, float] = field(init=False, default=(0, 0))
+    """
+    Size of the figure in inches
+    """
 
     def setup(self, theme: theme, themeable_name: str):
+        """
+        Setup the margin to be used in the layout
+
+        For the margin's values to be useful, we need to be able to
+        convert them to different units as is required. Here we get
+        all the parameters that we shall need to do the conversions.
+        """
+        self.themeable_name = themeable_name
         self.fontsize = theme.getp((themeable_name, "size"), 11)
         self.figure_size = theme.getp("figure_size")
 
@@ -35,6 +73,8 @@ class margin:
     def pt(self) -> margin:
         """
         Return margin in points
+
+        These are the units of the display coordinate system
         """
         return self.to("pt")
 
@@ -42,6 +82,8 @@ class margin:
     def inch(self) -> margin:
         """
         Return margin in inches
+
+        These are the units of the figure-inches coordinate system
         """
         return self.to("in")
 
@@ -56,6 +98,8 @@ class margin:
     def fig(self) -> margin:
         """
         Return margin in figure units
+
+        These are the units of the figure coordinate system
         """
         return self.to("fig")
 
@@ -102,3 +146,22 @@ class margin:
         }
 
         return functions[conversion](value)
+
+
+def margin_auto(
+    t: float = 0.0,
+    r: float | None = None,
+    b: float | None = None,
+    l: float | None = None,
+    unit: Literal["pt", "in", "lines", "fig"] = "pt",
+) -> margin:
+    """
+    Create margin with minimal arguments
+    """
+    if r is None:
+        r = t
+    if b is None:
+        b = t
+    if l is None:
+        l = r
+    return margin(t, r, b, l, unit)

plotnine/themes/theme_gray.py

@@ -6,6 +6,7 @@ from .elements import (
     element_rect,
     element_text,
     margin,
+    margin_auto,
 )
 from .theme import theme
 
@@ -27,6 +28,7 @@ class theme_gray(theme):
 
     def __init__(self, base_size=11, base_family=None):
         base_family = base_family or get_option("base_family")
+        half_line = base_size / 2
         quarter_line = base_size / 4
         fifth_line = base_size / 5
         eighth_line = base_size / 8
@@ -88,7 +90,7 @@ class theme_gray(theme):
             legend_spacing=10,  # points
             legend_text=element_text(
                 size=base_size * 0.8,
-                margin=margin(m / 1.5, m / 1.5, m / 1.5, m / 1.5, "fig"),
+                margin=margin_auto(m / 1.5, unit="fig"),
             ),
             legend_ticks=element_line(color="#CCCCCC", size=1),
             legend_title=element_text(
@@ -135,8 +137,8 @@ class theme_gray(theme):
             strip_text=element_text(
                 color="#1A1A1A",
                 size=base_size * 0.8,
-                linespacing=1.0,
-                margin=margin(1 / 3, 1 / 3, 1 / 3, 1 / 3, "lines"),
+                linespacing=1.5,
+                margin=margin_auto(half_line * 0.8),
             ),
             strip_text_y=element_text(rotation=-90),
             complete=True,

plotnine/themes/theme_matplotlib.py

@@ -5,6 +5,7 @@ from .elements import (
     element_rect,
     element_text,
     margin,
+    margin_auto,
 )
 from .theme import theme
 
@@ -33,6 +34,7 @@ class theme_matplotlib(theme):
         m = get_option("base_margin")
         base_size = mpl.rcParams.get("font.size", 11)
         linewidth = mpl.rcParams.get("grid.linewidth", 0.8)
+        half_line = base_size / 2
 
         super().__init__(
             line=element_line(size=linewidth),
@@ -68,9 +70,7 @@ class theme_matplotlib(theme):
             legend_margin=0,
             legend_position="right",
             legend_spacing=10,
-            legend_text=element_text(
-                margin=margin(m / 2, m / 2, m / 2, m / 2, "fig")
-            ),
+            legend_text=element_text(margin=margin_auto(m / 2, unit="fig")),
             legend_ticks=element_line(color="black"),
             legend_title=element_text(
                 ha="left",
@@ -111,7 +111,8 @@ class theme_matplotlib(theme):
                 fill="#D9D9D9", color="black", size=linewidth
             ),
             strip_text=element_text(
-                margin=margin(1 / 3, 1 / 3, 1 / 3, 1 / 3, "lines"),
+                linespacing=1.5,
+                margin=margin_auto(half_line * 0.8),
             ),
             strip_text_y=element_text(rotation=-90),
             complete=True,

plotnine/themes/theme_seaborn.py

@@ -5,6 +5,7 @@ from .elements import (
     element_rect,
     element_text,
     margin,
+    margin_auto,
 )
 from .theme import theme
 
@@ -20,7 +21,7 @@ class theme_seaborn(theme):
 
     Parameters
     ----------
-    style: "whitegrid", "darkgrid", "nogrid", "ticks"
+    style: "white", "dark", "whitegrid", "darkgrid",  "ticks"
         Style of axis background.
     context: "notebook", "talk", "paper", "poster"]``
         Intended context for resulting figures.
@@ -83,13 +84,15 @@ class theme_seaborn(theme):
             legend_position="right",
             legend_spacing=10,  # points
             legend_text=element_text(
-                margin=margin(m / 1.5, m / 1.5, m / 1.5, m / 1.5, "fig")
+                size=base_size * 0.8,
+                margin=margin_auto(m / 1.5, unit="fig"),
             ),
             legend_ticks=element_line(color="#CCCCCC", size=1),
             legend_title=element_text(
                 margin=margin(t=m, l=m * 2, b=m / 2, r=m * 2, unit="fig")
             ),
             panel_spacing=m,
+            panel_background=element_rect(fill=rcparams["axes.facecolor"]),
             plot_caption=element_text(
                 size=base_size * 0.8,
                 ha="right",
@@ -123,8 +126,8 @@ class theme_seaborn(theme):
             strip_background=element_rect(color="none", fill="#D1CDDF"),
             strip_text=element_text(
                 size=base_size * 0.8,
-                linespacing=1.0,
-                margin=margin(1 / 3, 1 / 3, 1 / 3, 1 / 3, "lines"),
+                linespacing=1.5,
+                margin=margin_auto(half_line * 0.8),
             ),
             strip_text_y=element_text(rotation=-90),
             complete=True,

plotnine/themes/theme_void.py

@@ -1,5 +1,11 @@
 from ..options import get_option
-from .elements import element_blank, element_line, element_text, margin
+from .elements import (
+    element_blank,
+    element_line,
+    element_text,
+    margin,
+    margin_auto,
+)
 from .theme import theme
 
 
@@ -19,6 +25,7 @@ class theme_void(theme):
 
     def __init__(self, base_size=11, base_family=None):
         base_family = base_family or get_option("base_family")
+        half_line = base_size / 2
         m = get_option("base_margin")
         # Use only inherited elements and make everything blank
         theme.__init__(
@@ -54,7 +61,7 @@ class theme_void(theme):
             legend_spacing=10,
             legend_text=element_text(
                 size=base_size * 0.8,
-                margin=margin(m / 1.5, m / 1.5, m / 1.5, m / 1.5, "fig"),
+                margin=margin_auto(m / 1.5, unit="fig"),
             ),
             legend_ticks=element_line(color="#CCCCCC", size=1),
             legend_title=element_text(
@@ -94,8 +101,8 @@ class theme_void(theme):
             strip_text=element_text(
                 color="#1A1A1A",
                 size=base_size * 0.8,
-                linespacing=1.0,
-                margin=margin(1 / 3, 1 / 3, 1 / 3, 1 / 3, "lines"),
+                linespacing=1.5,
+                margin=margin_auto(half_line * 0.8),
             ),
             complete=True,
         )

plotnine/themes/themeable.py

@@ -852,7 +852,7 @@ class strip_text_x(MixinSequenceOfValues):
     theme_element : element_text
     """
 
-    _omit = ["margin", "ha"]
+    _omit = ["margin", "ha", "va"]
 
     def apply_figure(self, figure: Figure, targets: ThemeTargets):
         super().apply_figure(figure, targets)
@@ -875,7 +875,7 @@ class strip_text_y(MixinSequenceOfValues):
     theme_element : element_text
     """
 
-    _omit = ["margin", "va"]
+    _omit = ["margin", "ha", "va"]
 
     def apply_figure(self, figure: Figure, targets: ThemeTargets):
         super().apply_figure(figure, targets)

plotnine/typing.py

@@ -80,7 +80,7 @@ FacetSpaceRatios: TypeAlias = dict[Literal["x", "y"], Sequence[float]]
 
 StripPosition: TypeAlias = Literal["top", "right"]
 
-## Scales
+# Scales
 
 # Name names of scaled aesthetics
 ScaledAestheticsName: TypeAlias = Literal[
@@ -110,7 +110,7 @@ ScaledAestheticsName: TypeAlias = Literal[
     "upper",
 ]
 
-## Coords
+# Coords
 CoordRange: TypeAlias = tuple[float, float]
 
 # Guide

{plotnine-0.15.0a1.dist-info → plotnine-0.15.0a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotnine
-Version: 0.15.0a1
+Version: 0.15.0a3
 Summary: A Grammar of Graphics for Python
 Author-email: Hassan Kibirige <has2k1@gmail.com>
 License: The MIT License (MIT)
@@ -46,7 +46,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib>=3.8.0
 Requires-Dist: pandas>=2.2.0
-Requires-Dist: mizani~=0.13.0
+Requires-Dist: mizani~=0.14.0
 Requires-Dist: numpy>=1.23.5
 Requires-Dist: scipy>=1.8.0
 Requires-Dist: statsmodels>=0.14.0
@@ -60,8 +60,11 @@ Requires-Dist: plotnine[dev]; extra == "all"
 Provides-Extra: extra
 Requires-Dist: adjustText>=1.2.0; extra == "extra"
 Requires-Dist: geopandas>=1.0.0; extra == "extra"
-Requires-Dist: scikit-learn>1.2.0; extra == "extra"
+Requires-Dist: geodatasets>=2024.8.0; extra == "extra"
+Requires-Dist: scikit-learn>=1.3.0; extra == "extra"
 Requires-Dist: scikit-misc>=0.5.1; extra == "extra"
+Requires-Dist: polars>=1.24.0; extra == "extra"
+Requires-Dist: pyarrow>=19.0.1; extra == "extra"
 Provides-Extra: doc
 Requires-Dist: jupyter; extra == "doc"
 Requires-Dist: click; extra == "doc"
@@ -79,7 +82,7 @@ Requires-Dist: twine; extra == "dev"
 Requires-Dist: plotnine[typing]; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Provides-Extra: typing
-Requires-Dist: pyright==1.1.399; extra == "typing"
+Requires-Dist: pyright==1.1.402; extra == "typing"
 Requires-Dist: ipython; extra == "typing"
 Requires-Dist: pandas-stubs; extra == "typing"
 Dynamic: license-file