Update adjustText and other fixes

Author: oscargus

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10", "3.11", "3.12", "3.13"]
-        mpl-version: ["3.7", "3.8", "3.9", "3.10", "latest"]
+        mpl-version: ["3.9", "3.10", "latest"]
         exclude:
           # Latest MPL requires Python 3.11
           - mpl-version: "latest"
@@ -67,7 +67,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.11"]
-        mpl-version: ["3.7", "latest"]
+        mpl-version: ["3.9", "latest"]
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.pre-commit-config.yaml

@@ -45,3 +45,13 @@ repos:
     hooks:
       - id: pyupgrade
         args: [--py310-plus]
+
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.4.1
+    hooks:
+      - id: codespell
+
+  - repo: https://github.com/shssoichiro/oxipng
+    rev: v9.1.5
+    hooks:
+      - id: oxipng

changelog.rst

@@ -31,14 +31,17 @@ Changed
 - BREAKING: The *only_name_when_one* argument to :class:`.FactorFormatter` was replaced with
   *name_on_all_numbers*, so that, e.g., the degree sign is always shown.
 - BREAKING: All functions in :mod:`mplsignal.scipyplot` now use a constrained layout. This
-  will in general make the plot clearer, although at the expense of margin.
+  will in general make the plot clearer, although at the expense of less margin.
 - Minimum Python version is increased to 3.10.
+- Minimum adjustText version is set to 1.3.
+- Minimum Matplotlib version is increased to 3.9.
 
 Fixed
 ^^^^^
 
 - ``freq_unit`` was not propagated properly in all ``freq_plots.zfreq*`` functions and
   ``style``-combinations.
+- The ``adjust`` argument to the ``*plane`` functions is removed as it is not supported by newer versions of adjustText.
 
 [0.2.0] - 2023-03-05
 --------------------

lib/mplsignal/plane_plots.py

@@ -22,7 +22,6 @@ def zplane(
     zeros=None,
     poles=None,
     ax=None,
-    adjust=1,
     spinelinewidth: float = 0.2,
     spinecolor='black',
     zeromarker='o',
@@ -52,9 +51,6 @@ def zplane(
     ax : :class:`~matplotlib.axes.Axes`, optional
         Axes to plot in.
 
-    adjust : int, default: 1
-        Number of times to execute text adjustment. Set to 0 to disable.
-
     spinelinewidth : float, default: 0.2
         Line width of spines.
 
@@ -162,7 +158,7 @@ def zplane(
                 linewidth=spinelinewidth,
             )
         )
-    texts = _plot_plane(
+    xvals, yvals, texts = _plot_plane(
         zeros,
         poles,
         ax=ax,
@@ -173,12 +169,9 @@ def zplane(
         multiplicity_props=multiplicity_props,
         **kwargs,
     )
-    if texts:
-        for _ in range(adjust):
-            # Fix for adjustText = 0.8
-            ax.figure.draw_without_rendering()
-            adjustText.adjust_text(texts, ax=ax)
     ax.axis('equal')
+    if texts:
+        adjustText.adjust_text(texts, x=xvals, y=yvals, ax=ax)
     return ax
 
 
@@ -292,7 +285,9 @@ def _plot_plane(
     -------
     List of texts.
     """
-    ret = []
+    text_items = []
+    xvals = []
+    yvals = []
     if multiplicity_props is None:
         multiplicity_props = {}
     if zeros is not None:
@@ -304,7 +299,11 @@ def _plot_plane(
             **zero_props,
             **kwargs,
         )
-        ret += [ax.text(x, y, text, **multiplicity_props) for x, y, text in texts]
+        xvals.extend(x_pos)
+        yvals.extend(y_pos)
+        text_items.extend(
+            ax.text(x, y, text, **multiplicity_props) for x, y, text in texts
+        )
 
     if poles is not None:
         poles_d = _get_multiplicities(poles)
@@ -315,11 +314,15 @@ def _plot_plane(
             **pole_props,
             **kwargs,
         )
-        ret += [ax.text(x, y, text, **multiplicity_props) for x, y, text in texts]
+        xvals.extend(x_pos)
+        yvals.extend(y_pos)
+        text_items.extend(
+            ax.text(x, y, text, **multiplicity_props) for x, y, text in texts
+        )
 
     ax.set_xlabel(reallabel)
     ax.set_ylabel(imaglabel)
-    return ret
+    return xvals, yvals, text_items
 
 
 def _is_close(x, y):

pyproject.toml

@@ -3,16 +3,16 @@ name = "mplsignal"
 description = "Matplotlib extension for signal processing-related plots"
 authors = [{ name = "Oscar Gustafsson", email = "oscar.gustafsson@gmail.com" }]
 requires-python = ">=3.10"
-license = { file = "LICENSE" }
+license = "BSD-3-clause"
+license-files = ["LICENSE"]
 readme = "README.md"
 dynamic = ["version"]
-dependencies = ["matplotlib>=3.9", "adjustText"]
+dependencies = ["matplotlib>=3.9", "adjustText>=1.3"]
 classifiers = [
   "Development Status :: 3 - Alpha",
   "Framework :: Matplotlib",
   "Intended Audience :: Developers",
   "Intended Audience :: Science/Research",
-  "License :: OSI Approved :: BSD License",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3.10",