Merge branch 'main' of https://github.com/microsoft/python-type-stubs into Replace-Remove-doc-comments-script-with-RUff

Author: Avasam

.github/workflows/test.yml

@@ -46,9 +46,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Run Ruff Linter
-        uses: astral-sh/ruff-action@v1
-
-      - name: Run Ruff Formatter
-        uses: astral-sh/ruff-action@v1
+        uses: astral-sh/ruff-action@v3
         with:
-          args: "format --check"
+          version: "0.9.*"
+      - run: ruff format --check

pyproject.toml

@@ -37,76 +37,33 @@ ignore = [
     ###
     # Rules we don't want or don't agree with
     ###
-    # Typeshed doesn't want complex or non-literal defaults for maintenance and testing reasons.
+    # 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: Investigate and fix or configure
     "PYI001",
     "PYI002",
     "PYI017",
-    "PYI019", # Request for autofix: https://github.com/astral-sh/ruff/issues/14183
+    "PYI019", # Request for more autofixes: https://github.com/astral-sh/ruff/issues/15798
     "PYI024",
-    "PYI034", # Request for autofix: https://github.com/astral-sh/ruff/issues/14184
-    "PYI041", # Request for autofix: https://github.com/astral-sh/ruff/issues/14185
     "PYI048",
     "PYI051", # Request for autofix: https://github.com/astral-sh/ruff/issues/14185
     "PYI052",
 ]
+
 [tool.ruff.lint.per-file-ignores]
 # We keep docstrings in sklearn
 "stubs/sklearn/**" = ["PYI021"]
 
 [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):
-    ...
+def test(verbosity=..., coverage=..., **kwargs): ...

stubs/matplotlib/artist.pyi

@@ -13,8 +13,7 @@ def allow_rasterization(
     draw,
 ) -> Callable: ...
 
-class _Unset:
-    ...
+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/backends/backend_agg.pyi

@@ -35,7 +35,7 @@ class RendererAgg(RendererBase):
     def get_text_width_height_descent(self, s: str, prop: FontProperties, ismath: bool) -> tuple[float, float, float]: ...
     def draw_tex(self, gc: GraphicsContextBase, x, y, s: str, prop: FontProperties, angle, *, mtext=...) -> None: ...
     def get_canvas_width_height(self) -> tuple[float, float]: ...
-    def points_to_pixels(self, points: int | float) -> float: ...
+    def points_to_pixels(self, points: float) -> float: ...
     def buffer_rgba(self) -> memoryview: ...
     def tostring_argb(self) -> bytes: ...
     def tostring_rgb(self) -> bytes: ...

stubs/matplotlib/backends/backend_pdf.pyi

@@ -2,6 +2,7 @@ from enum import Enum
 from functools import total_ordering
 from io import BytesIO
 from typing import Any, Callable, Optional, Set
+from typing_extensions import Self
 
 import numpy as np
 from matplotlib._enums import CapStyle, JoinStyle
@@ -217,7 +218,7 @@ class GraphicsContextPdf(GraphicsContextBase):
     joinstyles: dict[str, int] = ...
     def capstyle_cmd(self, style: CapStyle) -> list[int | Op]: ...
     def joinstyle_cmd(self, style: JoinStyle) -> list[int | Op]: ...
-    def linewidth_cmd(self, width: int | float) -> list[float | Op]: ...
+    def linewidth_cmd(self, width: float) -> list[float | Op]: ...
     def dash_cmd(self, dashes) -> list: ...
     def alpha_cmd(self, alpha: float, forced: bool, effective_alphas: tuple[float, float]) -> list[Name | Op]: ...
     def hatch_cmd(self, hatch: None, hatch_color: tuple[float, float, float, float]) -> list[Name | Op | float]: ...
@@ -239,7 +240,7 @@ class GraphicsContextPdf(GraphicsContextBase):
 
 class PdfPages:
     def __init__(self, filename: str, keep_empty: bool = ..., metadata: dict[str, Any] = ...) -> None: ...
-    def __enter__(self) -> PdfPages: ...
+    def __enter__(self) -> Self: ...
     def __exit__(self, exc_type, exc_val, exc_tb) -> None: ...
     def close(self) -> None: ...
     def infodict(self) -> dict[str, Any]: ...

stubs/matplotlib/backends/backend_pgf.pyi

@@ -1,4 +1,5 @@
 from typing import Any, Callable
+from typing_extensions import Self
 
 import numpy as np
 from matplotlib import _api
@@ -89,7 +90,7 @@ class _BackendPgf(_Backend):
 
 class PdfPages:
     def __init__(self, filename: str | PathLike, *, keep_empty: bool = True, metadata: dict[str, Any] = ...) -> None: ...
-    def __enter__(self) -> PdfPages: ...
+    def __enter__(self) -> Self: ...
     def __exit__(self, exc_type, exc_val, exc_tb) -> None: ...
     def close(self) -> None: ...
     def savefig(self, figure: Figure | int = ..., **kwargs) -> None: ...

stubs/matplotlib/backends/backend_qt.pyi

@@ -47,8 +47,8 @@ class FigureCanvasQT(QtWidgets.QWidget, FigureCanvasBase):
     def keyPressEvent(self, event) -> None: ...
     def keyReleaseEvent(self, event) -> None: ...
     def resizeEvent(self, event) -> None: ...
-    def sizeHint(self) -> QtCore.QSize: ...
-    def minumumSizeHint(self) -> QtCore.QSize: ...
+    def sizeHint(self) -> QtCore.QSize: ...  # type: ignore
+    def minumumSizeHint(self) -> QtCore.QSize: ...  # type: ignore
     def flush_events(self) -> None: ...
     def start_event_loop(self, timeout=...) -> None: ...
     def stop_event_loop(self, event=...) -> None: ...
@@ -58,7 +58,7 @@ class FigureCanvasQT(QtWidgets.QWidget, FigureCanvasBase):
     def drawRectangle(self, rect) -> None: ...
 
 class MainWindow(QtWidgets.QMainWindow):
-    closing: QtCore.Signal = ...
+    closing: QtCore.Signal = ...  # type: ignore
     def closeEvent(self, event) -> None: ...
 
 class FigureManagerQT(FigureManagerBase):
@@ -71,7 +71,7 @@ class FigureManagerQT(FigureManagerBase):
     def set_window_title(self, title) -> None: ...
 
 class NavigationToolbar2QT(NavigationToolbar2, QtWidgets.QToolBar):
-    message: QtCore.Signal = ...
+    message: QtCore.Signal = ...  # type: ignore
     toolitems: list = ...
     def __init__(self, canvas, parent=..., coordinates=...) -> None: ...
     def edit_parameters(self) -> None: ...

stubs/matplotlib/cbook/__init__.pyi

@@ -63,9 +63,7 @@ class Stack:
     def bubble(self, o): ...
     def remove(self, o) -> None: ...
 
-def report_memory(i=...):
-    ...
-
+def report_memory(i=...): ...
 def safe_masked_invalid(x, copy=...) -> np.ndarray: ...
 def print_cycles(objects, outstream=..., show_progress: bool = ...) -> None: ...