From da6b32e02b66832556d2e668fed1392d94f965ba Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Fri, 9 May 2025 20:49:12 +0100
Subject: [PATCH] Enable linting of .pyi files

---
 lib/matplotlib/__init__.pyi   | 2 ++
 lib/matplotlib/_enums.pyi     | 1 -
 lib/matplotlib/axes/_axes.pyi | 2 --
 lib/matplotlib/colorizer.pyi  | 1 -
 lib/matplotlib/colors.pyi     | 8 ++++----
 lib/matplotlib/contour.pyi    | 2 +-
 lib/matplotlib/table.pyi      | 2 +-
 lib/matplotlib/text.pyi       | 2 +-
 pyproject.toml                | 3 +--
 9 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/lib/matplotlib/__init__.pyi b/lib/matplotlib/__init__.pyi
index 88058ffd7def..07019109f406 100644
--- a/lib/matplotlib/__init__.pyi
+++ b/lib/matplotlib/__init__.pyi
@@ -26,6 +26,8 @@ __all__ = [
     "interactive",
     "is_interactive",
     "colormaps",
+    "multivar_colormaps",
+    "bivar_colormaps",
     "color_sequences",
 ]
 
diff --git a/lib/matplotlib/_enums.pyi b/lib/matplotlib/_enums.pyi
index 714e6cfe03fa..3ff7e208c398 100644
--- a/lib/matplotlib/_enums.pyi
+++ b/lib/matplotlib/_enums.pyi
@@ -1,4 +1,3 @@
-from typing import cast
 from enum import Enum
 
 
diff --git a/lib/matplotlib/axes/_axes.pyi b/lib/matplotlib/axes/_axes.pyi
index a23a0b27f01b..c3eb28d2f095 100644
--- a/lib/matplotlib/axes/_axes.pyi
+++ b/lib/matplotlib/axes/_axes.pyi
@@ -2,7 +2,6 @@ from matplotlib.axes._base import _AxesBase
 from matplotlib.axes._secondary_axes import SecondaryAxis
 
 from matplotlib.artist import Artist
-from matplotlib.backend_bases import RendererBase
 from matplotlib.collections import (
     Collection,
     FillBetweenPolyCollection,
@@ -32,7 +31,6 @@ import matplotlib.table as mtable
 import matplotlib.stackplot as mstack
 import matplotlib.streamplot as mstream
 
-import datetime
 import PIL.Image
 from collections.abc import Callable, Iterable, Sequence
 from typing import Any, Literal, overload
diff --git a/lib/matplotlib/colorizer.pyi b/lib/matplotlib/colorizer.pyi
index 8fcce3e5d63b..f35ebe5295e4 100644
--- a/lib/matplotlib/colorizer.pyi
+++ b/lib/matplotlib/colorizer.pyi
@@ -1,6 +1,5 @@
 from matplotlib import cbook, colorbar, colors, artist
 
-from typing import overload
 import numpy as np
 from numpy.typing import ArrayLike
 
diff --git a/lib/matplotlib/colors.pyi b/lib/matplotlib/colors.pyi
index 3e761c949068..eadd759bcaa3 100644
--- a/lib/matplotlib/colors.pyi
+++ b/lib/matplotlib/colors.pyi
@@ -196,8 +196,8 @@ class BivarColormap:
     M: int
     n_variates: int
     def __init__(
-    	self, N: int = ..., M: int | None = ..., shape: Literal['square', 'circle', 'ignore', 'circleignore'] = ...,
-    	origin: Sequence[float] = ..., name: str = ...
+        self, N: int = ..., M: int | None = ..., shape: Literal['square', 'circle', 'ignore', 'circleignore'] = ...,
+        origin: Sequence[float] = ..., name: str = ...
     ) -> None: ...
     @overload
     def __call__(
@@ -245,8 +245,8 @@ class SegmentedBivarColormap(BivarColormap):
 
 class BivarColormapFromImage(BivarColormap):
     def __init__(
-    	self, lut: np.ndarray, shape: Literal['square', 'circle', 'ignore', 'circleignore'] = ...,
-    	origin: Sequence[float] = ..., name: str = ...
+        self, lut: np.ndarray, shape: Literal['square', 'circle', 'ignore', 'circleignore'] = ...,
+        origin: Sequence[float] = ..., name: str = ...
     ) -> None: ...
 
 class Normalize:
diff --git a/lib/matplotlib/contour.pyi b/lib/matplotlib/contour.pyi
index 7400fac50993..2a89d6016170 100644
--- a/lib/matplotlib/contour.pyi
+++ b/lib/matplotlib/contour.pyi
@@ -1,7 +1,7 @@
 import matplotlib.cm as cm
 from matplotlib.artist import Artist
 from matplotlib.axes import Axes
-from matplotlib.collections import Collection, PathCollection
+from matplotlib.collections import Collection
 from matplotlib.colorizer import Colorizer, ColorizingArtist
 from matplotlib.colors import Colormap, Normalize
 from matplotlib.path import Path
diff --git a/lib/matplotlib/table.pyi b/lib/matplotlib/table.pyi
index 07d2427f66dc..167d98d3c4cb 100644
--- a/lib/matplotlib/table.pyi
+++ b/lib/matplotlib/table.pyi
@@ -8,7 +8,7 @@ from .transforms import Bbox
 from .typing import ColorType
 
 from collections.abc import Sequence
-from typing import Any, Literal, TYPE_CHECKING
+from typing import Any, Literal
 
 from pandas import DataFrame
 
diff --git a/lib/matplotlib/text.pyi b/lib/matplotlib/text.pyi
index 9cdfd9596a7d..41c7b761ae32 100644
--- a/lib/matplotlib/text.pyi
+++ b/lib/matplotlib/text.pyi
@@ -14,7 +14,7 @@ from .transforms import (
     Transform,
 )
 
-from collections.abc import Callable, Iterable
+from collections.abc import Iterable
 from typing import Any, Literal
 from .typing import ColorType, CoordsType
 
diff --git a/pyproject.toml b/pyproject.toml
index dc951375bba2..81a1c32baf34 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -99,8 +99,6 @@ exclude = [
     "tools/gh_api.py",
     ".tox",
     ".eggs",
-    # TODO: fix .pyi files
-    "*.pyi",
     # TODO: fix .ipynb files
     "*.ipynb"
 ]
@@ -173,6 +171,7 @@ external = [
 convention = "numpy"
 
 [tool.ruff.lint.per-file-ignores]
+"*.pyi" = ["E501"]
 "doc/conf.py" = ["E402"]
 "galleries/examples/animation/frame_grabbing_sgskip.py" = ["E402"]
 "galleries/examples/images_contours_and_fields/tricontour_demo.py" = ["E201"]