Update pre-commit hooks

oscargus · oscargus · commit 3e474ad1a793 · 2025-04-29T19:09:05.000+02:00
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -35,11 +35,13 @@ any necessary plotted data.
 <!--If this used to work in an earlier version of Matplotlib, please note the version it used to work on-->
 
 **Version Info**
+
 <!--Please specify your platform and versions of the relevant libraries you are using:-->
-  * Operating system:
-  * mplsignal version:
-  * Matplotlib version:
-  * Matplotlib backend (`print(matplotlib.get_backend())`):
-  * Python version:
-  * Jupyter version (if applicable):
-  * Other libraries:
+
+- Operating system:
+- mplsignal version:
+- Matplotlib version:
+- Matplotlib backend (`print(matplotlib.get_backend())`):
+- Python version:
+- Jupyter version (if applicable):
+- Other libraries:
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
@@ -17,7 +17,6 @@ If you are referencing an existing piece of documentation or example please prov
 * There is no example showing how to do [...]
 -->
 
-
 ### Suggested Improvement
 
 <!--
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -32,4 +32,3 @@ Before creating a new feature request please search the issues for relevant feat
 
 * Another project [...] solved this by [...]
 -->
-
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -5,24 +5,23 @@ on:
   release:
     types: [published]
 
-
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Install Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install packaging setuptools twine wheel build
-    - name: Publish the Python package
-      env:
-        TWINE_USERNAME: __token__
-        TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-      run: |
-        python -m build -s -w
-        twine upload dist/*
+      - uses: actions/checkout@v3
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.x"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install packaging setuptools twine wheel build
+      - name: Publish the Python package
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
+        run: |
+          python -m build -s -w
+          twine upload dist/*
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10", "3.11", "3.12", "3.13"]
-        mpl-version: ["3.9", "3.10", "latest"]
+        mpl-version: ["3.7", "3.8", "3.9", "3.10", "latest"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-docstring-first
@@ -10,22 +10,22 @@ repos:
       - id: trailing-whitespace
         exclude_types: [svg]
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 25.1.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 6.0.1
     hooks:
       - id: isort
         name: isort (python)
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.4.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.9-for-vscode
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
         files: \.(html|md|yml|yaml|toml)
@@ -34,8 +34,14 @@ repos:
           - prettier@2.7.1
           - prettier-plugin-toml@0.3.1
 
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
+  - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: "v0.0.267"
+    rev: "v0.11.7"
     hooks:
       - id: ruff
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.19.1
+    hooks:
+      - id: pyupgrade
+        args: [--py310-plus]
diff --git a/README.md b/README.md
@@ -17,12 +17,13 @@ Documentation can be found [here](https://mplsignal.readthedocs.io/).
 
 mplsignal currently consists of four main parts:
 
-   * `plane_plots`: various `splane` and `zplane` for plotting pole-zero diagrams
-   * `freq_plots`: various `freqs` and `freqz` methods for plotting magnitude and phase responses of transfer functions
-   * `ticker`: tickers and formatters suitable for `freqs`/`freqz`-plots
-   * `scipyplot`: convenience functions that can be directly fed to `scipy.signal.freqs` and ` scipy.signal.freqz`
+- `plane_plots`: various `splane` and `zplane` for plotting pole-zero diagrams
+- `freq_plots`: various `freqs` and `freqz` methods for plotting magnitude and phase responses of transfer functions
+- `ticker`: tickers and formatters suitable for `freqs`/`freqz`-plots
+- `scipyplot`: convenience functions that can be directly fed to `scipy.signal.freqs` and ` scipy.signal.freqz`
 
 ## Dependencies
+
 mplsignal is only useful if you also have [Matplotlib](https://matplotlib.org/) installed.
 In addition, it relies on [adjustText](https://adjusttext.readthedocs.io/) to position the multiplicity
 numbers next to poles and zeros.
diff --git a/changelog.rst b/changelog.rst
@@ -31,6 +31,7 @@ Changed
   *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.
+- Minimum Python version is increased to 3.10.
 
 Fixed
 ^^^^^
diff --git a/docs/Makefile b/docs/Makefile
@@ -20,4 +20,4 @@ watch:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/docs/generate_logo.py b/docs/generate_logo.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Thu Mar  9 10:53:13 2023
 
diff --git a/examples/freqz_styles.py b/examples/freqz_styles.py
@@ -17,9 +17,8 @@
 """
 
 import matplotlib.pyplot as plt
-from scipy import signal
-
 from mplsignal import freqz
+from scipy import signal
 
 b, a = signal.ellip(7, 1, 60, 0.4)
 
diff --git a/lib/mplsignal/__init__.py b/lib/mplsignal/__init__.py
@@ -2,6 +2,7 @@
 mplsignal is a Matplotlib extension with some functions and classes aimed
 at creating signal processing-related plots.
 """
+
 # Copyright (c) Oscar Gustafsson.
 # Distributed under the terms of the Modified BSD License.
 
diff --git a/lib/mplsignal/_utils.py b/lib/mplsignal/_utils.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# coding: utf-8
 
 # Copyright (c) Oscar Gustafsson.
 # Distributed under the terms of the Modified BSD License.
diff --git a/lib/mplsignal/plane_plots.py b/lib/mplsignal/plane_plots.py
@@ -12,7 +12,6 @@
 ]
 
 import math
-from typing import Optional
 
 import adjustText
 import matplotlib.pyplot as plt
@@ -32,8 +31,8 @@ def zplane(
     markercolor=None,
     zerofillstyle='none',
     polefillstyle='none',
-    reallabel: Optional[str] = None,
-    imaglabel: Optional[str] = None,
+    reallabel: str | None = None,
+    imaglabel: str | None = None,
     zero_props=None,
     pole_props=None,
     multiplicity_props=None,
diff --git a/lib/mplsignal/ticker.py b/lib/mplsignal/ticker.py
@@ -7,7 +7,6 @@
 """
 import math
 from fractions import Fraction
-from typing import Optional
 
 from matplotlib.ticker import Formatter, Locator, MaxNLocator
 
@@ -33,7 +32,7 @@ class FactorLocator(Locator):
         Additional arguments passed to :class:`~matplotlib.tickers.MaxNLocator`.
     """
 
-    def __init__(self, factor: float = 1.0, nbins: Optional[int] = None, **kwargs):
+    def __init__(self, factor: float = 1.0, nbins: int | None = None, **kwargs):
         """
         Locator for finding multiples of *factor*.
         """
@@ -70,14 +69,14 @@ class PiLocator(FactorLocator):
         Number of bins to aim for, see :class:`~matplotlib.tickers.MaxNLocator`.
     """
 
-    def __init__(self, nbins: Optional[int] = None, **kwargs):
+    def __init__(self, nbins: int | None = None, **kwargs):
         super().__init__(factor=math.pi, nbins=nbins, **kwargs)
 
 
 class SampleFrequencyLocator(FactorLocator):
     """Locator for finding multiples of sample frequency."""
 
-    def __init__(self, nbins: Optional[int] = None, fs: float = 1.0, **kwargs):
+    def __init__(self, nbins: int | None = None, fs: float = 1.0, **kwargs):
         super().__init__(factor=fs / (2 * math.pi), nbins=nbins, **kwargs)
 
 
@@ -91,7 +90,7 @@ class DegreeLocator(MaxNLocator):
         Number of bins to aim for, see :class:`~matplotlib.tickers.MaxNLocator`.
     """
 
-    def __init__(self, nbins: Optional[int] = None, **kwargs):
+    def __init__(self, nbins: int | None = None, **kwargs):
         steps = kwargs.pop('steps', [1, 1.5, 2, 3, 5, 6, 10])
         if nbins is None:
             nbins = 'auto'
diff --git a/readthedocs.yml b/readthedocs.yml
@@ -1,11 +1,11 @@
 version: 2
 python:
-    version: 3.8
-    install:
-      - method: pip
-        path: .
-        extra_requirements:
-          - doc
+  version: 3.10
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - doc
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
diff --git a/tests/test_ticker.py b/tests/test_ticker.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# coding: utf-8
 
 # Copyright (c) Oscar Gustafsson.
 # Distributed under the terms of the Modified BSD License.
@@ -8,7 +7,6 @@
 import math
 
 import numpy as np
-
 from mplsignal.ticker import PiFormatter, PiLocator, PiRationalFormatter
 
 

Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,3 @@ Before creating a new feature request please search the issues for relevant feat`
`32`	`32`
`33`	`33`	`* Another project [...] solved this by [...]`
`34`	`34`	`-->`
`35`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#!/usr/bin/env python3`
`2`		`-# -- coding: utf-8 --`
`3`	`2`	`"""`
`4`	`3`	`Created on Thu Mar 9 10:53:13 2023`
`5`	`4`