Merge branch 'main' into Update-astral-sh/ruff-action

Author: debonte

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
           python-version: "3.11"
 
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}

pyproject.toml

@@ -27,59 +27,42 @@ line-length = 130
 target-version = "py39"
 
 [tool.ruff.lint]
+# TODO: Use extend-select instead to get base E and F rules that don't conflict with the formatter
 select = [
+    "FA", # flake8-future-annotations
     "I", # isort
+    "PYI", # flake8-pyi
+]
+ignore = [
+    ###
+    # Rules we don't want or don't agree with
+    ###
+    # Typeshed doesn't want complex or non-literal defaults, or long strings, for maintenance and testing reasons.
+    # This doesn't affect us, let's have more complete stubs.
+    "PYI011",
+    "PYI014",
+    "PYI053",
+
+    # TODO: Handle in its own PR
+    "PYI021", # https://github.com/microsoft/python-type-stubs/pull/343
+
+    # TODO: Investigate and fix or configure
+    "PYI001",
+    "PYI002",
+    "PYI017",
+    "PYI019", # Request for more autofixes: https://github.com/astral-sh/ruff/issues/15798
+    "PYI024",
+    "PYI048",
+    "PYI051", # Request for autofix: https://github.com/astral-sh/ruff/issues/14185
+    "PYI052",
 ]
 
 [tool.ruff.lint.isort]
 combine-as-imports = true
 extra-standard-library = [
+    # Group these with stdlib
     "typing_extensions",
     "_typeshed",
-    # Extra modules not recognized by Ruff/isort
-    "_ast",
-    "_bisect",
-    "_bootlocale",
-    "_codecs",
-    "_collections_abc",
-    "_compat_pickle",
-    "_compression",
-    "_csv",
-    "_ctypes",
-    "_curses",
-    "_decimal",
-    "_dummy_thread",
-    "_dummy_threading",
-    "_heapq",
-    "_imp",
-    "_json",
-    "_locale",
-    "_lsprof",
-    "_markupbase",
-    "_msi",
-    "_operator",
-    "_osx_support",
-    "_posixsubprocess",
-    "_py_abc",
-    "_pydecimal",
-    "_random",
-    "_sitebuiltins",
-    "_socket",
-    "_sqlite3",
-    "_ssl",
-    "_stat",
-    "_thread",
-    "_threading_local",
-    "_tkinter",
-    "_tracemalloc",
-    "_warnings",
-    "_weakref",
-    "_weakrefset",
-    "_winapi",
-    "genericpath",
-    "opcode",
-    "pyexpat",
-    "zoneinfo",
 ]
 
 [tool.pyright]

stubs/matplotlib/__init__.pyi

@@ -47,5 +47,4 @@ def is_interactive() -> bool: ...
 
 default_test_modules: list[str] = ...
 
-def test(verbosity=..., coverage=..., **kwargs):
-    int: ...
+def test(verbosity=..., coverage=..., **kwargs): ...

stubs/matplotlib/_layoutgrid.pyi

@@ -18,7 +18,6 @@ class LayoutGrid:
         width_ratios: None | list[float] = None,
         height_ratios: None | list[float] = None,
     ) -> None: ...
-    def __repr__(self) -> str: ...
     def reset_margins(self) -> None: ...
     def add_constraints(self) -> None: ...
     def hard_constraints(self) -> None: ...

stubs/matplotlib/_mathtext.pyi

@@ -111,7 +111,6 @@ class DejaVuSansFontConstants(FontConstantsBase): ...
 
 class Node:
     def __init__(self) -> None: ...
-    def __repr__(self) -> str: ...
     def get_kerning(self, next) -> float: ...
     def shrink(self) -> None: ...
     def render(self, x: float, y: float) -> None: ...
@@ -129,7 +128,6 @@ class Hbox(Box):
 
 class Char(Node):
     def __init__(self, c, state) -> None: ...
-    def __repr__(self) -> str: ...
     def is_slanted(self) -> bool: ...
     def get_kerning(self, next) -> float: ...
     def render(self, x: float, y: float) -> None: ...
@@ -141,7 +139,6 @@ class Accent(Char):
 
 class List(Box):
     def __init__(self, elements) -> None: ...
-    def __repr__(self) -> str: ...
     def shrink(self) -> None: ...
 
 class Hlist(List):
@@ -179,7 +176,6 @@ class Kern(Node):
     height: float = ...
     depth: float = ...
     def __init__(self, width: float) -> None: ...
-    def __repr__(self) -> str: ...
     def shrink(self) -> None: ...
 
 class AutoHeightChar(Hlist):

stubs/matplotlib/_typing.pyi

@@ -1,20 +1,21 @@
 import decimal
 import io
+import typing_extensions
 
 import numpy.typing
 import pandas as pd
 
 Decimal = decimal.Decimal
-PythonScalar = str | int | float | bool
+PythonScalar: typing_extensions.TypeAlias = str | int | float | bool
 
 ArrayLike = numpy.typing.ArrayLike
 FileLike = io.IOBase
 PathLike = str
 
-PandasScalar = pd.Period | pd.Timestamp | pd.Timedelta | pd.Interval
-Scalar = PythonScalar | PandasScalar
+PandasScalar: typing_extensions.TypeAlias = pd.Period | pd.Timestamp | pd.Timedelta | pd.Interval
+Scalar: typing_extensions.TypeAlias = PythonScalar | PandasScalar
 
-Color = tuple[float, float, float] | str
+Color: typing_extensions.TypeAlias = tuple[float, float, float] | str
 
 __all__ = [
     "ArrayLike",

stubs/matplotlib/animation.pyi

@@ -15,7 +15,7 @@ class MovieWriterRegistry:
     def __init__(self) -> None: ...
     def register(self, name: str) -> Callable: ...
     def is_available(self, name: str) -> bool: ...
-    def __iter__(self) -> Generator: ...
+    def __iter__(self) -> Iterator: ...
     def list(self) -> list[MovieWriter]: ...
     def __getitem__(self, name) -> MovieWriter: ...
 

stubs/matplotlib/artist.pyi

@@ -13,8 +13,7 @@ def allow_rasterization(
     draw,
 ) -> Callable: ...
 
-class _Unset:
-    def __repr__(self) -> str: ...
+class _Unset: ...
 
 class Artist:
     zorder: int = ...

stubs/matplotlib/axes/_axes.pyi

@@ -574,7 +574,7 @@ class Axes(_AxesBase):
         precision: float | Literal["present"] = 0,
         marker=...,
         markersize=...,
-        aspect: Literal["equal", "auto", None] | float = "equal",
+        aspect: Literal["equal", "auto"] | None | float = "equal",
         origin: Literal["upper", "lower"] = ...,
         **kwargs,
     ) -> AxesImage | Line2D: ...

stubs/matplotlib/axes/_base.pyi

@@ -25,7 +25,6 @@ class _axis_method_wrapper:
 class _AxesBase(Artist):
     name: str = ...
 
-    def __str__(self) -> str: ...
     def __init__(
         self,
         fig: Figure,
@@ -43,7 +42,6 @@ class _AxesBase(Artist):
     ) -> None: ...
     def __getstate__(self) -> dict[str, Any]: ...
     def __setstate__(self, state) -> None: ...
-    def __repr__(self) -> str: ...
     def get_window_extent(self, renderer=..., *args, **kwargs) -> TransformedBbox: ...
     def set_figure(self, fig: Figure) -> None: ...
     @property