Add ruff fixes for new min Python version

Author: stefmolin

src/data_morph/plotting/animation.py

@@ -6,11 +6,13 @@
 import re
 from functools import wraps
 from pathlib import Path
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
 
 from PIL import Image
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from ..shapes.bases.shape import Shape
 
 
@@ -115,7 +117,7 @@ def wrapper(step: int | float) -> int | float:
         int or float
             The eased value at the current step, from 0.0 to 1.0.
         """
-        if not (isinstance(step, (int, float)) and 0 <= step <= 1):
+        if not (isinstance(step, int | float) and 0 <= step <= 1):
             raise ValueError('Step must be an integer or float, between 0 and 1.')
         return easing_function(step)
 

src/data_morph/plotting/style.py

@@ -1,11 +1,11 @@
 """Utility functions for styling Matplotlib plots."""
 
-from collections.abc import Generator
+from collections.abc import Callable, Generator
 from contextlib import contextmanager
 from functools import wraps
 from importlib.resources import as_file, files
 from pathlib import Path
-from typing import Any, Callable
+from typing import Any
 
 import matplotlib.pyplot as plt
 

src/data_morph/shapes/bases/line_collection.py

@@ -121,5 +121,5 @@ def plot(self, ax: Axes | None = None) -> Axes:
             fig.get_layout_engine().set(w_pad=0.2, h_pad=0.2)
         _ = ax.axis('equal')
         for start, end in self.lines:
-            ax.plot(*list(zip(start, end)), 'k-')
+            ax.plot(*list(zip(start, end, strict=False)), 'k-')
         return ax

src/data_morph/shapes/lines/star.py

@@ -1,5 +1,7 @@
 """Star shape."""
 
+import itertools
+
 from ...data.dataset import Dataset
 from ..bases.line_collection import LineCollection
 
@@ -46,4 +48,4 @@ def __init__(self, dataset: Dataset) -> None:
             [xmin, ymin + y_range * 0.625],
         ]
 
-        super().__init__(*list(zip(pts[:-1], pts[1:])))
+        super().__init__(*list(itertools.pairwise(pts)))

tests/bounds/test_interval.py

@@ -91,7 +91,7 @@ def test_getitem(self):
     def test_iter(self):
         """Test that the __iter__() method is working."""
         limits = [0, 1]
-        for bound, limit in zip(Interval(limits), limits):
+        for bound, limit in zip(Interval(limits), limits, strict=False):
             assert bound == limit
 
     @pytest.mark.parametrize(

tests/data/test_loader.py

@@ -67,7 +67,9 @@ def test_plot_available_datasets(self, monkeypatch, subset):
         assert len(populated_axs) == len(DataLoader.AVAILABLE_DATASETS)
         assert all(ax.get_xlabel() == ax.get_ylabel() == '' for ax in populated_axs)
 
-        for dataset, ax in zip(DataLoader.AVAILABLE_DATASETS, populated_axs):
+        for dataset, ax in zip(
+            DataLoader.AVAILABLE_DATASETS, populated_axs, strict=False
+        ):
             subplot_title = ax.get_title()
             assert subplot_title.startswith(dataset)
             assert subplot_title.endswith(' points)')

tests/shapes/circles/test_circle.py

@@ -32,5 +32,6 @@ def test_is_circle(self, shape):
         for x, y in zip(
             cx + shape.radius * np.cos(angles),
             cy + shape.radius * np.sin(angles),
+            strict=False,
         ):
             assert pytest.approx(shape.distance(x, y)) == 0