plotnine 0.16.0a3__tar.gz → 0.16.0a4__tar.gz

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotnine
-Version: 0.16.0a3
+Version: 0.16.0a4
 Summary: A Grammar of Graphics for Python
 Author-email: Hassan Kibirige <has2k1@gmail.com>
 License: The MIT License (MIT)
@@ -68,8 +68,9 @@ Requires-Dist: pyarrow>=19.0.1; extra == "extra"
 Provides-Extra: doc
 Requires-Dist: jupyter; extra == "doc"
 Requires-Dist: click; extra == "doc"
+Requires-Dist: griffe==1.15.0; extra == "doc"
 Requires-Dist: numpydoc>=0.9.1; extra == "doc"
-Requires-Dist: quartodoc>=0.7.2; extra == "doc"
+Requires-Dist: quartodoc>=0.11.1; extra == "doc"
 Provides-Extra: lint
 Requires-Dist: ruff; extra == "lint"
 Provides-Extra: test
@@ -251,12 +252,5 @@ Testing
 -------
 
 Plotnine has tests that generate images which are compared to baseline images known
-to be correct. To generate images that are consistent across all systems you have
-to install matplotlib from source. You can do that with ``pip`` using the command.
-
-```console
-$ pip install matplotlib --no-binary matplotlib
-```
-
-Otherwise there may be small differences in the text rendering that throw off the
-image comparisons.
+to be correct. There may be small differences in the text rendering that throw off the
+image comparisons, and the tests allow some very small differences.

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/README.md

@@ -162,12 +162,5 @@ Testing
 -------
 
 Plotnine has tests that generate images which are compared to baseline images known
-to be correct. To generate images that are consistent across all systems you have
-to install matplotlib from source. You can do that with ``pip`` using the command.
-
-```console
-$ pip install matplotlib --no-binary matplotlib
-```
-
-Otherwise there may be small differences in the text rendering that throw off the
-image comparisons.
+to be correct. There may be small differences in the text rendering that throw off the
+image comparisons, and the tests allow some very small differences.

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/doc/_quartodoc.yml

@@ -586,6 +586,10 @@ quartodoc:
       contents:
           - get_aesthetic_limits
 
+    - package: plotnine.session
+      contents:
+          - last_plot
+
     - title: Datasets
       desc: |
         These datasets ship with the plotnine and you can import them with

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/doc/changelog.qmd

@@ -48,6 +48,11 @@ title: Changelog
   [](:class:`~plotnine.geom_point`) when the shape is mapped to variable with missing
   values.
 
+### Enhancements
+
+- Increased the default linespacing used by themes from `0.9` to `1.2`.
+  This gives multiline titles, subtitles and captions a better balance between looking compact and looking crumpled.
+
 ## v0.15.3
 (2025-01-28)
 

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/plotnine/composition/_compose.py

@@ -18,6 +18,7 @@ from ..composition._plot_annotation import plot_annotation
 from ..composition._plot_layout import plot_layout
 from ..composition._types import ComposeAddable
 from ..options import get_option
+from ..session import set_last_plot
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -559,6 +560,7 @@ class Compose:
             self.theme.apply()
             figure.set_layout_engine(PlotnineLayoutEngine(self))
 
+        set_last_plot(self)
         return figure
 
     def _draw_plots(self):

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/plotnine/ggplot.py

@@ -42,11 +42,13 @@ from .layer import Layers
 from .mapping.aes import aes
 from .options import get_option
 from .scales.scales import Scales
+from .session import set_last_plot
 from .themes.theme import theme, theme_get
 
 if TYPE_CHECKING:
     from typing import Protocol
 
+    import pandas as pd
     from matplotlib.axes import Axes
     from matplotlib.figure import Figure
     from typing_extensions import Self
@@ -374,6 +376,7 @@ class ggplot:
             self.theme.apply()
             figure.set_layout_engine(PlotnineLayoutEngine(self))
 
+        set_last_plot(self)
         return figure
 
     def _setup(self) -> Figure:
@@ -771,6 +774,25 @@ class ggplot:
         with plot_context(self).rc_context:
             sv.figure.savefig(**sv.kwargs)
 
+    def layer_data(self, i: int = 0) -> pd.DataFrame:
+        """
+        Return the data used to draw a specific plot layer
+
+        Parameters
+        ----------
+        i :
+            Index of the layer to retrieve, starting from 0.
+
+        Returns
+        -------
+        pd.DataFrame
+            Data used by the specified layer after all transformations,
+            statistics, and position adjustments have been applied.
+        """
+        p = deepcopy(self)
+        p._build()
+        return p.layers.data[i]
+
 
 ggsave = ggplot.save
 

plotnine-0.16.0a4/plotnine/session.py

@@ -0,0 +1,45 @@
+"""
+Session state for plotnine
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from plotnine.composition._compose import Compose
+    from plotnine.ggplot import ggplot
+
+__all__ = ("last_plot",)
+
+LAST_PLOT: ggplot | Compose | None = None
+
+
+def last_plot() -> ggplot | Compose | None:
+    """
+    Retrieve the last plot rendered in this session
+
+    Returns
+    -------
+    ggplot | Compose | None
+        The last plot that was rendered via `draw()`, `save()`,
+        or notebook display. Returns `None` if no plot has been
+        rendered yet.
+    """
+    return LAST_PLOT
+
+
+def set_last_plot(plot: ggplot | Compose) -> None:
+    """
+    Save the last plot rendered in this session
+    """
+    global LAST_PLOT
+    LAST_PLOT = plot
+
+
+def reset_last_plot() -> None:
+    """
+    Clear the last plot rendered in this session
+    """
+    global LAST_PLOT
+    LAST_PLOT = None

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/plotnine/themes/theme.py

@@ -105,6 +105,7 @@ class theme:
     # be targeted for theming by the themeables
     # It is initialised in the setup method.
     targets: ThemeTargets
+    _is_retina = False
 
     def __init__(
         self,
@@ -463,8 +464,13 @@ class theme:
 
         The result is a theme that has double the dpi.
         """
+        if self._is_retina:
+            return deepcopy(self)
+
         dpi = self.getp("dpi")
-        return self + theme(dpi=dpi * 2)
+        self = self + theme(dpi=dpi * 2)
+        self._is_retina = True
+        return self
 
     def _smart_title_and_subtitle_ha(
         self, title: str | None, subtitle: str | None

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/plotnine/themes/theme_gray.py

@@ -47,7 +47,7 @@ class theme_gray(theme):
                 color="black",
                 ma="center",
                 size=base_size,
-                linespacing=0.9,
+                linespacing=1.2,
                 rotation=0,
                 margin=margin(),
             ),

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/plotnine/themes/theme_void.py

@@ -36,7 +36,7 @@ class theme_void(theme):
                 style="normal",
                 color="black",
                 size=base_size,
-                linespacing=0.9,
+                linespacing=1.2,
                 rotation=0,
                 margin=margin(),
             ),

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/plotnine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotnine
-Version: 0.16.0a3
+Version: 0.16.0a4
 Summary: A Grammar of Graphics for Python
 Author-email: Hassan Kibirige <has2k1@gmail.com>
 License: The MIT License (MIT)
@@ -68,8 +68,9 @@ Requires-Dist: pyarrow>=19.0.1; extra == "extra"
 Provides-Extra: doc
 Requires-Dist: jupyter; extra == "doc"
 Requires-Dist: click; extra == "doc"
+Requires-Dist: griffe==1.15.0; extra == "doc"
 Requires-Dist: numpydoc>=0.9.1; extra == "doc"
-Requires-Dist: quartodoc>=0.7.2; extra == "doc"
+Requires-Dist: quartodoc>=0.11.1; extra == "doc"
 Provides-Extra: lint
 Requires-Dist: ruff; extra == "lint"
 Provides-Extra: test
@@ -251,12 +252,5 @@ Testing
 -------
 
 Plotnine has tests that generate images which are compared to baseline images known
-to be correct. To generate images that are consistent across all systems you have
-to install matplotlib from source. You can do that with ``pip`` using the command.
-
-```console
-$ pip install matplotlib --no-binary matplotlib
-```
-
-Otherwise there may be small differences in the text rendering that throw off the
-image comparisons.
+to be correct. There may be small differences in the text rendering that throw off the
+image comparisons, and the tests allow some very small differences.

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/plotnine.egg-info/SOURCES.txt

@@ -49,6 +49,7 @@ plotnine/layer.py
 plotnine/options.py
 plotnine/py.typed
 plotnine/qplot.py
+plotnine/session.py
 plotnine/typing.py
 plotnine/watermark.py
 plotnine.egg-info/PKG-INFO
@@ -326,6 +327,7 @@ tests/test_scale_internals.py
 tests/test_scale_labelling.py
 tests/test_scale_linetype.py
 tests/test_scale_symlog.py
+tests/test_session.py
 tests/test_stat.py
 tests/test_stat_calculate_methods.py
 tests/test_stat_ecdf.py

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/plotnine.egg-info/requires.txt

@@ -25,8 +25,9 @@ pre-commit
 [doc]
 jupyter
 click
+griffe==1.15.0
 numpydoc>=0.9.1
-quartodoc>=0.7.2
+quartodoc>=0.11.1
 
 [extra]
 adjustText>=1.2.0

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/pyproject.toml

@@ -57,8 +57,9 @@ extra = [
 doc = [
     "jupyter",
     "click",
+    "griffe==1.15.0",
     "numpydoc>=0.9.1",
-    "quartodoc>=0.7.2",
+    "quartodoc>=0.11.1",
 ]
 
 lint = [

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/tests/conftest.py

@@ -218,27 +218,6 @@ class _test_cleanup:
         warnings.resetwarnings()
 
 
-def layer_data(p, i=0):
-    """
-    Return layer information used to draw the plot
-
-    Parameters
-    ----------
-    p : ggplot
-        ggplot object
-    i : int
-        Layer number
-
-    Returns
-    -------
-    out : dataframe
-        Layer information
-    """
-    p = deepcopy(p)
-    p._build()
-    return p.layers.data[i]
-
-
 def composition_equals(cmp: Compose, name: str) -> bool:
     """
     Compare plot composition to image determined by `right`

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/tests/test_geom_bar_col_histogram.py

@@ -13,8 +13,6 @@ from plotnine import (
 )
 from plotnine.stats.binning import freedman_diaconis_bins
 
-from .conftest import layer_data
-
 n = 10  # Some even number greater than 2
 
 # ladder: 0 1 times, 1 2 times, 2 3 times, ...
@@ -60,8 +58,8 @@ def test_histogram_count():
 def test_scale_transformed_breaks():
     data = pd.DataFrame({"x": np.repeat(range(1, 5), range(1, 5))})
     p = ggplot(data, aes("x")) + geom_histogram(breaks=[1, 2.5, 4])
-    out1 = layer_data(p)
-    out2 = layer_data(p + scale_x_sqrt())
+    out1 = p.layer_data()
+    out2 = (p + scale_x_sqrt()).layer_data()
     np.testing.assert_allclose(out1.xmin, [1, 2.5])
     np.testing.assert_allclose(out2.xmin, np.sqrt([1, 2.5]))
 

{plotnine-0.16.0a3 → plotnine-0.16.0a4}/tests/test_geom_bin_2d.py

@@ -3,8 +3,6 @@ import pandas as pd
 
 from plotnine import aes, geom_bin_2d, ggplot, scale_x_log10
 
-from .conftest import layer_data
-
 n = 20  # Make even for best results
 reps = np.hstack(
     [np.arange(int(np.ceil(n / 2))), np.arange(int(np.ceil(n // 2)))[::-1]]
@@ -34,7 +32,7 @@ def test_scale_transformed_breaks():
     p = ggplot(data, aes("x", "y")) + geom_bin_2d(
         breaks=([5, 50, 500], [0.5, 1.5, 2.5])
     )
-    out1 = layer_data(p)
-    out2 = layer_data(p + scale_x_log10())
+    out1 = p.layer_data()
+    out2 = (p + scale_x_log10()).layer_data()
     np.testing.assert_allclose(out1.xmax, [50, 500])
     np.testing.assert_allclose(out2.xmax, np.log10([50, 500]))

plotnine-0.16.0a4/tests/test_session.py

@@ -0,0 +1,43 @@
+from tempfile import NamedTemporaryFile
+
+from plotnine import aes, geom_point, ggplot
+from plotnine.composition import Compose
+from plotnine.data import mtcars
+from plotnine.session import last_plot, reset_last_plot
+
+
+def test_last_plot_initially_none():
+    reset_last_plot()
+    assert last_plot() is None
+
+
+def test_last_plot_after_draw():
+    reset_last_plot()
+    p = ggplot(mtcars, aes("wt", "mpg")) + geom_point()
+    p.draw()
+    assert last_plot() is not None
+    assert isinstance(last_plot(), ggplot)
+
+
+def test_last_plot_after_save(tmp_path):
+    reset_last_plot()
+    p = ggplot(mtcars, aes("wt", "mpg")) + geom_point()
+
+    with NamedTemporaryFile(suffix=".png") as tmp_file:
+        p.save(tmp_file.name, verbose=False)
+
+    result = last_plot()
+    assert result is not None
+    # save() deepcopies, so last_plot won't be the same object
+    assert isinstance(result, ggplot)
+
+
+def test_last_plot_tracks_compose():
+    reset_last_plot()
+    p1 = ggplot(mtcars, aes("wt", "mpg")) + geom_point()
+    p2 = ggplot(mtcars, aes("hp", "mpg")) + geom_point()
+    compose = p1 | p2
+    compose.draw()
+    result = last_plot()
+    assert result is not None
+    assert isinstance(result, Compose)