leanplot 1.0.0__tar.gz → 1.1.1__tar.gz

{leanplot-1.0.0 → leanplot-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: leanplot
-Version: 1.0.0
+Version: 1.1.1
 Summary: Provides some classes for fast matplotlib plotting based on ISO 80000.
 Author-email: Joel Kimmich <software@igte.uni-stuttgart.de>
 License-Expression: MIT
@@ -8,7 +8,7 @@ Project-URL: Homepage, https://codeberg.org/IGTE/leanplot
 Project-URL: Documentation, https://codeberg.org/IGTE/leanplot
 Project-URL: Repository, https://codeberg.org/IGTE/leanplot
 Project-URL: Issues, https://codeberg.org/IGTE/leanplot/issues
-Project-URL: Changelog, https://codeberg.org/IGTE/leanplot/CHANGELOG.rst
+Project-URL: Changelog, https://codeberg.org/IGTE/leanplot/src/branch/main/CHANGELOG.rst
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Education
@@ -31,7 +31,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: matplotlib>=3.10.0
 Requires-Dist: numpy>=2.0.0
-Requires-Dist: cmcrameri
+Requires-Dist: cmcrameri>=1.9
 Provides-Extra: dev
 Requires-Dist: ruff>=0.15.8; extra == "dev"
 Requires-Dist: build>=1.4.2; extra == "dev"

{leanplot-1.0.0 → leanplot-1.1.1}/leanplot/core/bar.py

@@ -29,8 +29,8 @@ class BarPlot(PlotMixin):
             return min_diff * 0.8
         return 1
 
-    def plot(self):
-        self.ax.bar(self.x, self.ys, width=self.bar_width, color=next(self.next_color))
+    def plot(self, **kwargs):
+        self.ax.bar(self.x, self.ys, width=self.bar_width, color=next(self.next_color), **kwargs)
         self.format()
 
     def format(self):

{leanplot-1.0.0 → leanplot-1.1.1}/leanplot/core/colors/__init__.py

@@ -6,6 +6,6 @@
 #  ------------------------------------------------------------------------------
 #
 
-from leanplot.core.colors.categorical import ColorPalette
+from leanplot.core.colors.palette import ColorPalette
 
 __all__ = ["ColorPalette"]

leanplot-1.0.0/leanplot/core/colors/categorical.py → leanplot-1.1.1/leanplot/core/colors/palette.py

@@ -22,14 +22,35 @@ class ColorPalette:
         Number of categorical colors to use from the colormap.
     """
 
-    def __init__(self, colormap_name: str = "oslo", number_of_colors: int = 5) -> None:
-        self.colormap_name = colormap_name
+    def __init__(self,
+                 colormap_name: str = "batlow",
+                 number_of_colors: int = 5,
+                 categorial: bool = True,
+                 reversed_colormap: bool = False) -> None:
+        if colormap_name.endswith("_r"):
+            colormap_name = colormap_name[:-2]
+            reversed_colormap = True
+        if colormap_name.endswith("S"):
+            colormap_name = colormap_name[:-1]
+            categorial = True
+        self.__colormap_name = colormap_name
         self.number_of_colors = number_of_colors
+        self.categorial = categorial
+        self.reversed_colormap = reversed_colormap
+
+    @property
+    def colormap_name(self) -> str:
+        append_str = ""
+        if self.categorial:
+            append_str += "S"
+        if self.reversed_colormap:
+            append_str += "_r"
+        return self.__colormap_name + append_str
 
     @property
     def colors(self) -> list[tuple[float, float, float]]:
         """
-        Return categorical colors from the predefined categorical colormap.
+        Return colors from the predefined colormap.
 
         Returns
         -------
@@ -39,18 +60,23 @@ class ColorPalette:
         Raises
         ------
         AttributeError
-            If the categorical colormap `f"{colormap_name}S"` is not defined in `cmcrameri.cm`.
+            If the colormap `colormap_name` is not defined in `cmcrameri.cm`.
         ValueError
             If `number_of_colors` exceeds the number of colors available in the categorical colormap.
         """
-        categorical_colormap = getattr(cmc, f"{self.colormap_name}S")
-        available_colors = categorical_colormap.colors
+        colormap = getattr(cmc, self.colormap_name)
+        if self.categorial:
+            available_colors = colormap.colors
+        else:
+            available_colors = colormap.resampled(self.number_of_colors).colors
         if self.number_of_colors > len(available_colors):
             raise ValueError(
                 f"Requested {self.number_of_colors} colors, but colormap "
-                f"'{self.colormap_name}S' only provides {len(available_colors)} colors."
+                f"'{self.colormap_name}' only provides {len(available_colors)} colors."
             )
-        return [tuple(color[:3]) for color in available_colors[: self.number_of_colors]]
+        if self.categorial:
+            return [tuple(color[:3]) for color in available_colors[: self.number_of_colors]]
+        return [tuple(color[:3]) for color in available_colors]
 
     @staticmethod
     def available_categorical_colormap_names() -> list[str]:

{leanplot-1.0.0 → leanplot-1.1.1}/leanplot/core/double_y.py

@@ -1,11 +1,3 @@
-#  ------------------------------------------------------------------------------
-#  Copyright (c) 2026 Joel Kimmich
-#  ------------------------------------------------------------------------------
-#  License
-#      This file is part of LeanPlot, distributed under MIT license.
-#  ------------------------------------------------------------------------------
-#
-
 #  ------------------------------------------------------------------------------
 #  Copyright (c) 2026 Joel Kimmich
 #  ------------------------------------------------------------------------------
@@ -93,7 +85,7 @@ class DoubleY(PlotMixin):
         self.ax_right.set_ylim(right_min, right_max)
         self.ax_right.set_yticks(right_ticks)
 
-    def plot(self):
+    def plot(self, **kwargs):
 
         for i, y in enumerate(self.ys_left):
             self._add_line_and_label(
@@ -105,6 +97,7 @@ class DoubleY(PlotMixin):
                     marker=next(self.next_marker),
                     markersize=self.marker_size,
                     linestyle="None",
+                    **kwargs
                 ),
                 self.labels_left[i],
             )
@@ -119,6 +112,7 @@ class DoubleY(PlotMixin):
                     marker=next(self.next_marker),
                     markersize=self.marker_size,
                     linestyle="None",
+                    **kwargs
                 ),
                 self.labels_right[i],
             )
@@ -168,7 +162,7 @@ class DoubleYSeparated(DoubleY):
         self.labels = labels
         self.same_marker = same_marker
 
-    def plot(self):
+    def plot(self, **kwargs):
 
         for i, (y_left, y_right) in enumerate(zip(self.ys_left, self.ys_right)):
             marker = next(self.next_marker)
@@ -181,6 +175,7 @@ class DoubleYSeparated(DoubleY):
                     marker=marker,
                     markersize=self.marker_size,
                     linestyle="None",
+                    **kwargs,
                 )
             )
 
@@ -195,6 +190,7 @@ class DoubleYSeparated(DoubleY):
                     marker=marker,
                     markersize=self.marker_size,
                     linestyle="None",
+                    **kwargs,
                 )
             )
 

{leanplot-1.0.0 → leanplot-1.1.1}/leanplot/core/functions.py

@@ -58,7 +58,10 @@ def custom_numeric_ticks_formatter(x, pos):
         return f"{x:g}".replace(".", ",")
 
 
-def format_date_x_axis(start_date: datetime, end_date: datetime, ax, return_version: bool = True) -> str | None:
+def format_date_x_axis(start_date: datetime,
+                       end_date: datetime,
+                       ax,
+                       return_version: bool = True) -> str | None:
     """
     Formats the ticks of an axis as date.
 

{leanplot-1.0.0 → leanplot-1.1.1}/leanplot/core/line.py

@@ -22,6 +22,7 @@ class LinePlot(PlotMixin):
         x_title=None,
         width_mm=160,
         height_mm=90,
+        **kwargs,
     ):
         if not isinstance(ys, list):
             if not (isinstance(ys, np.ndarray) and len(ys.shape) > 1 and ys.shape[0] > 1 and ys.shape[1] > 1):
@@ -30,7 +31,9 @@ class LinePlot(PlotMixin):
             if len(ys) == len(x):
                 ys = [np.array(ys)]
         ys = [np.array(y) for y in ys]
-        super().__init__(x=np.array(x), ys=ys, y_title=y_title, x_title=x_title, width_mm=width_mm, height_mm=height_mm)
+        super().__init__(
+            x=np.array(x), ys=ys, y_title=y_title, x_title=x_title, width_mm=width_mm, height_mm=height_mm, **kwargs
+        )
 
         if labels is None:
             labels = [None] * len(ys)
@@ -41,7 +44,7 @@ class LinePlot(PlotMixin):
         self.y_scale = y_scale
         self.line_width = linewidth
 
-    def plot(self, x=None, ys=None, labels=None):
+    def plot(self, x=None, ys=None, labels=None, **kwargs):
         if x is None:
             x = self.x
         if ys is None:
@@ -59,6 +62,7 @@ class LinePlot(PlotMixin):
                     color=next(self.next_color),
                     linewidth=self.line_width,
                     linestyle=next(self.next_line_style),
+                    **kwargs
                 )
             )
         self.format()

{leanplot-1.0.0 → leanplot-1.1.1}/leanplot/core/mixin.py

@@ -10,7 +10,7 @@ from datetime import datetime
 import matplotlib.ticker as ticker
 from matplotlib import pyplot as plt
 
-from leanplot.core.colors.categorical import ColorPalette
+from leanplot.core.colors.palette import ColorPalette
 from leanplot.core.functions import cm_to_inch, custom_numeric_ticks_formatter, format_date_x_axis
 
 
@@ -25,7 +25,7 @@ class PlotMixin(object):
         width_mm=160,
         height_mm=90,
         iter_color_and_style_together: bool = False,
-        iter_color_first: bool = True,
+        iter_color_first: bool = False,
         color_palette: ColorPalette | str | None = None,
     ):
         self.fig, self.ax = plt.subplots(layout="constrained")

leanplot-1.1.1/leanplot/debug.py

@@ -0,0 +1,28 @@
+#  ------------------------------------------------------------------------------
+#  Copyright (c) 2026 Joel Kimmich
+#  ------------------------------------------------------------------------------
+#  License
+#      This file is part of LeanPlot, distributed under MIT license.
+#  ------------------------------------------------------------------------------
+#
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+# make data:
+np.random.seed(1)
+x = [2.1, 3.8, 5.6]
+y = [2.6, 5, 4.2]
+yerr = [0.9, 1.2, 0.5]
+xerr = [0.2, 0.8, 0.3]
+
+# plot:
+fig, ax = plt.subplots()
+
+ax.errorbar(x, y, yerr, xerr=xerr, fmt='o', linewidth=2, capsize=6)
+
+ax.set(xlim=(0, 8), xticks=np.arange(1, 8),
+       ylim=(0, 8), yticks=np.arange(1, 8))
+ax.grid(True)
+plt.tight_layout()
+plt.show()

{leanplot-1.0.0 → leanplot-1.1.1}/leanplot/tests/test_mixin.py

@@ -10,7 +10,7 @@ from datetime import datetime
 from unittest import TestCase
 from unittest.mock import MagicMock, patch
 
-from leanplot.core.colors.categorical import ColorPalette
+from leanplot.core.colors.palette import ColorPalette
 from leanplot.core.mixin import PlotMixin
 
 
@@ -74,6 +74,7 @@ class TestPlotMixin(TestCase):
 
     def test_color_iter_cycles_back_to_first_color(self):
         """Verify that color_iter wraps around to the first color after exhausting the palette."""
+        self.plot_mixin.iter_color_first = True
         colors = self.plot_mixin.colors
         color_generator = self.plot_mixin.color_iter()
         produced_colors = [next(color_generator) for _ in range(len(colors) + 1)]
@@ -88,6 +89,7 @@ class TestPlotMixin(TestCase):
 
     def test_line_style_iter_switches_style_after_one_full_color_cycle(self):
         """Verify that line_style_iter switches to the next style after cycling through all colors."""
+        self.plot_mixin.iter_color_first = True
         number_of_colors = len(self.plot_mixin.colors)
         line_style_generator = self.plot_mixin.line_style_iter()
         produced_styles = [next(line_style_generator) for _ in range(number_of_colors + 1)]

leanplot-1.0.0/leanplot/tests/test_categorical.py → leanplot-1.1.1/leanplot/tests/test_palette.py

@@ -9,30 +9,55 @@ from unittest import TestCase
 
 import cmcrameri.cm as cmc
 
-from leanplot.core.colors.categorical import ColorPalette
+from leanplot.core.colors.palette import ColorPalette
 
 
 class TestColorPalette(TestCase):
     def test_default_initialization_uses_batlow_with_ten_colors(self):
         """Verify that default parameters select the batlow colormap with ten colors."""
-        color_palette = ColorPalette()
-        self.assertEqual(color_palette.colormap_name, "oslo")
+        color_palette = ColorPalette(categorial=False)
+        self.assertEqual(color_palette.colormap_name, "batlow")
         self.assertEqual(color_palette.number_of_colors, 5)
 
+    def test_reverse_colormap(self):
+        """Verify that the reverse colormap works correctly."""
+        color_palette = ColorPalette(categorial=False, reversed_colormap=True)
+        self.assertEqual(color_palette.colormap_name, "batlow_r")
+
+    def test_categorial_colormap(self):
+        """Verify that the reverse colormap works correctly."""
+        color_palette = ColorPalette(categorial=True, reversed_colormap=False)
+        self.assertEqual(color_palette.colormap_name, "batlowS")
+
+    def test_resampling(self):
+        """Verify that the reverse colormap works correctly."""
+        color_palette = ColorPalette(categorial=False, number_of_colors=6)
+        colors = color_palette.colors
+        self.assertEqual(len(colors), 6)
+        color_palette2 = ColorPalette(categorial=False, number_of_colors=10)
+        colors2 = color_palette2.colors
+        self.assertEqual(len(colors2), 10)
+        self.assertAlmostEqual(colors[0][0], colors2[0][0])
+        self.assertAlmostEqual(colors[0][1], colors2[0][1])
+        self.assertAlmostEqual(colors[0][2], colors2[0][2])
+        self.assertAlmostEqual(colors[-1][0], colors2[-1][0])
+        self.assertAlmostEqual(colors[-1][1], colors2[-1][1])
+        self.assertAlmostEqual(colors[-1][2], colors2[-1][2])
+
     def test_colors_returns_requested_number_of_colors(self):
         """Verify that the colors property returns exactly number_of_colors entries."""
-        color_palette = ColorPalette(colormap_name="batlow", number_of_colors=6)
+        color_palette = ColorPalette(colormap_name="oslo", number_of_colors=6)
         self.assertEqual(len(color_palette.colors), 6)
 
     def test_colors_returns_rgb_tuples_with_three_components(self):
         """Verify that each returned color is a tuple of three components."""
-        color_palette = ColorPalette(colormap_name="batlow", number_of_colors=4)
+        color_palette = ColorPalette(colormap_name="oslo", number_of_colors=4)
         for color in color_palette.colors:
             self.assertEqual(len(color), 3)
 
     def test_colors_components_are_within_valid_range(self):
         """Verify that each color component lies within the closed interval [0, 1]."""
-        color_palette = ColorPalette(colormap_name="batlow", number_of_colors=10)
+        color_palette = ColorPalette(colormap_name="oslo", number_of_colors=10)
         for color in color_palette.colors:
             for component in color:
                 self.assertGreaterEqual(component, 0.0)
@@ -40,8 +65,8 @@ class TestColorPalette(TestCase):
 
     def test_colors_match_source_categorical_colormap(self):
         """Verify that returned colors match the first entries of the underlying categorical colormap."""
-        color_palette = ColorPalette(colormap_name="oslo", number_of_colors=3)
-        expected_colors = [tuple(color[:3]) for color in cmc.osloS.colors[:3]]
+        color_palette = ColorPalette(colormap_name="batlow", number_of_colors=3, categorial=True)
+        expected_colors = [tuple(color[:3]) for color in cmc.batlowS.colors[:3]]
         self.assertEqual(color_palette.colors, expected_colors)
 
     def test_invalid_colormap_name_raises_attribute_error(self):
@@ -52,13 +77,13 @@ class TestColorPalette(TestCase):
 
     def test_number_of_colors_exceeding_available_raises_value_error(self):
         """Verify that requesting more colors than available raises a ValueError."""
-        available_color_count = len(cmc.batlowS.colors)
-        color_palette = ColorPalette(colormap_name="batlow", number_of_colors=available_color_count + 1)
+        available_color_count = len(cmc.osloS.colors)
+        color_palette = ColorPalette(colormap_name="oslo", number_of_colors=available_color_count + 1)
         with self.assertRaises(ValueError):
             _ = color_palette.colors
 
     def test_number_of_colors_equal_to_available_does_not_raise(self):
         """Verify that requesting exactly the available number of colors succeeds without error."""
-        available_color_count = len(cmc.batlowS.colors)
-        color_palette = ColorPalette(colormap_name="batlow", number_of_colors=available_color_count)
+        available_color_count = len(cmc.osloS.colors)
+        color_palette = ColorPalette(colormap_name="oslo", number_of_colors=available_color_count)
         self.assertEqual(len(color_palette.colors), available_color_count)

{leanplot-1.0.0 → leanplot-1.1.1}/leanplot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: leanplot
-Version: 1.0.0
+Version: 1.1.1
 Summary: Provides some classes for fast matplotlib plotting based on ISO 80000.
 Author-email: Joel Kimmich <software@igte.uni-stuttgart.de>
 License-Expression: MIT
@@ -8,7 +8,7 @@ Project-URL: Homepage, https://codeberg.org/IGTE/leanplot
 Project-URL: Documentation, https://codeberg.org/IGTE/leanplot
 Project-URL: Repository, https://codeberg.org/IGTE/leanplot
 Project-URL: Issues, https://codeberg.org/IGTE/leanplot/issues
-Project-URL: Changelog, https://codeberg.org/IGTE/leanplot/CHANGELOG.rst
+Project-URL: Changelog, https://codeberg.org/IGTE/leanplot/src/branch/main/CHANGELOG.rst
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Education
@@ -31,7 +31,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: matplotlib>=3.10.0
 Requires-Dist: numpy>=2.0.0
-Requires-Dist: cmcrameri
+Requires-Dist: cmcrameri>=1.9
 Provides-Extra: dev
 Requires-Dist: ruff>=0.15.8; extra == "dev"
 Requires-Dist: build>=1.4.2; extra == "dev"

{leanplot-1.0.0 → leanplot-1.1.1}/leanplot.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE.txt
 README.md
 pyproject.toml
 leanplot/__init__.py
+leanplot/debug.py
 leanplot.egg-info/PKG-INFO
 leanplot.egg-info/SOURCES.txt
 leanplot.egg-info/dependency_links.txt
@@ -14,8 +15,8 @@ leanplot/core/functions.py
 leanplot/core/line.py
 leanplot/core/mixin.py
 leanplot/core/colors/__init__.py
-leanplot/core/colors/categorical.py
+leanplot/core/colors/palette.py
 leanplot/tests/__init__.py
-leanplot/tests/test_categorical.py
 leanplot/tests/test_line.py
-leanplot/tests/test_mixin.py
+leanplot/tests/test_mixin.py
+leanplot/tests/test_palette.py

{leanplot-1.0.0 → leanplot-1.1.1}/leanplot.egg-info/requires.txt

@@ -1,6 +1,6 @@
 matplotlib>=3.10.0
 numpy>=2.0.0
-cmcrameri
+cmcrameri>=1.9
 
 [dev]
 ruff>=0.15.8

{leanplot-1.0.0 → leanplot-1.1.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "leanplot"
 license = "MIT"
 readme = "README.md"
-version = "1.0.0"
+version = "1.1.1"
 authors = [
     { name = "Joel Kimmich", email = "software@igte.uni-stuttgart.de" }
 ]
@@ -15,7 +15,7 @@ requires-python = ">=3.11"
 dependencies = [
     "matplotlib>=3.10.0",
     "numpy>=2.0.0",
-    "cmcrameri"
+    "cmcrameri>=1.9"
 ]
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -42,7 +42,7 @@ Homepage = "https://codeberg.org/IGTE/leanplot"
 Documentation = "https://codeberg.org/IGTE/leanplot"
 Repository = "https://codeberg.org/IGTE/leanplot"
 Issues = "https://codeberg.org/IGTE/leanplot/issues"
-Changelog = "https://codeberg.org/IGTE/leanplot/CHANGELOG.rst"
+Changelog = "https://codeberg.org/IGTE/leanplot/src/branch/main/CHANGELOG.rst"
 
 [project.optional-dependencies]
 #docs = ["Sphinx~=8.2.3", "sphinx_design~=0.6.1", "roman-numerals-py", "sphinx-gallery", "pydata_sphinx_theme>=0.16.1"]