Merge branch 'main' of https://github.com/microsoft/python-type-stubs into Remove-upstream-partial-transformers-stubs

Author: Avasam

.github/workflows/test.yml

@@ -4,17 +4,25 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     timeout-minutes: 10
+    strategy:
+      matrix:
+        # Oldest non-EOL and newest released
+        # scipy-stubs does not support Python 3.9
+        python-version: ["3.10", "3.13"]
+        # Tier 1 OSes
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+      fail-fast: false
 
     steps:
       - name: Check out code
         uses: actions/checkout@v2
 
-      - name: Setup Python
+      - name: Setup Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
-          python-version: "3.11"
+          python-version: ${{ matrix.python-version }}
 
       - name: Cache pip
         uses: actions/cache@v4
@@ -31,9 +39,10 @@ jobs:
         uses: jakebailey/pyright-action@v2
         with:
           pylance-version: latest-prerelease
+          python-version: ${{ matrix.python-version }}
 
       - name: Run mypy tests
-        run: python -m mypy .
+        run: python -m mypy . --python-version=${{ matrix.python-version }}
 
   hygiene:
     runs-on: ubuntu-latest
@@ -45,4 +54,5 @@ jobs:
 
       - name: Run Ruff Linter
         uses: astral-sh/ruff-action@v3
-      - run: ruff format --check
+      - name: Run Ruff Formatter
+        run: ruff format --check

pyproject.toml

@@ -21,7 +21,7 @@ tests = [
     "scipy-stubs",
     "typing_extensions",
 
-    # Untyped libraries, used to prevent "reportMissingImports" and get inferred typing
+    # Untyped libraries and partial stubs. Used to prevent "reportMissingImports" and get inferred typing
     "joblib",
     "networkx",
     "PyOpenGL",
@@ -140,15 +140,16 @@ python_version = "3.9" # Target oldest supported Python version
 strict = true
 check_untyped_defs = true # Strict check on all defs
 show_column_numbers = true
+# Not all imports in these stubs are gonna be typed
+# Don't infer symbols from untyped packages as Any
+follow_untyped_imports = true
 warn_unused_ignores = false # Change from pandas
 # Partial stubs are acceptable
 disallow_any_generics = false
 disallow_incomplete_defs = false
 disallow_untyped_defs = false
 # Suppressing errors
 disable_error_code = [
-    # Not all imports in these stubs are gonna be typed
-    "import-untyped",
     # mypy's overload implementation differs from pyright
     # `assert-type` issues is tests mostly comme from checking overloads
     # Since this project is specific to Pylance, just ignore them
@@ -157,6 +158,18 @@ disable_error_code = [
     # as they are inherited from the implementation.
     "override",
     # TODO
-    "assignment", # 773 errors in 172 files
-    "misc", # 692 errors in 132 files
+    "assignment", # 744 errors in 155 files
 ]
+
+[[tool.mypy.overrides]]
+# These modules are to be removed soon, not worth solving many issues
+module = ["matplotlib.*", "networkx.*"]
+disable_error_code = [
+    "assignment",
+    "misc",
+]
+[[tool.mypy.overrides]]
+module = ["sympy.*", "skimage.*", "sklearn.*"]
+# TODO: Too many untyped decorators still left
+# https://github.com/python/mypy/issues/19148
+disable_error_code = ["misc"]

stubs/matplotlib/_mathtext.pyi

@@ -1,11 +1,19 @@
 import enum
 import functools
-from tkinter.tix import HList
+import sys
+from _typeshed import Incomplete
 from typing import Literal
 
 from .font_manager import FontProperties
 from .mathtext import MathtextBackend
 
+# tkinter.tix was removed from Python 3.13
+# Recent matplotlib versions define HList in this module
+if sys.version_info >= (3, 13):
+    HList: Incomplete
+else:
+    from tkinter.tix import HList
+
 def get_unicode_index(symbol: str, math: bool = True) -> int: ...
 
 class Fonts:

stubs/skimage/__init__.pyi

@@ -4,7 +4,6 @@ from ._shared.version_requirements import ensure_python_version as ensure_python
 
 __version__: str = ...
 submodules: list = ...
-__getattr__ = ...
 __lazy_dir__ = ...
 
 def __dir__(): ...

stubs/skimage/_shared/setup.pyi

@@ -1,5 +1,88 @@
-from .._shared import lazy as lazy
+from ._binary_blobs import binary_blobs
+from ._fetchers import (
+    astronaut,
+    brain,
+    brick,
+    camera,
+    cat,
+    cell,
+    cells3d,
+    checkerboard,
+    chelsea,
+    clock,
+    coffee,
+    coins,
+    colorwheel,
+    data_dir,
+    download_all,
+    eagle,
+    file_hash,
+    grass,
+    gravel,
+    horse,
+    hubble_deep_field,
+    human_mitosis,
+    immunohistochemistry,
+    kidney,
+    lbp_frontal_face_cascade_filename,
+    lfw_subset,
+    lily,
+    logo,
+    microaneurysms,
+    moon,
+    nickel_solidification,
+    page,
+    palisades_of_vogt as palisades_of_vogt,
+    protein_transport,
+    retina,
+    rocket,
+    shepp_logan_phantom,
+    skin,
+    stereo_motorcycle,
+    text,
+    vortex,
+)
 
-__getattr__ = ...
-__dir__ = ...
-__all__ = ...  # pyright: ignore[reportUnsupportedDunderAll] # TODO
+__all__ = [
+    "astronaut",
+    "binary_blobs",
+    "brain",
+    "brick",
+    "camera",
+    "cat",
+    "cell",
+    "cells3d",
+    "checkerboard",
+    "chelsea",
+    "clock",
+    "coffee",
+    "coins",
+    "colorwheel",
+    "data_dir",
+    "download_all",
+    "eagle",
+    "file_hash",
+    "grass",
+    "gravel",
+    "horse",
+    "hubble_deep_field",
+    "human_mitosis",
+    "immunohistochemistry",
+    "kidney",
+    "lbp_frontal_face_cascade_filename",
+    "lfw_subset",
+    "lily",
+    "logo",
+    "microaneurysms",
+    "moon",
+    "nickel_solidification",
+    "page",
+    "protein_transport",
+    "retina",
+    "rocket",
+    "shepp_logan_phantom",
+    "skin",
+    "stereo_motorcycle",
+    "text",
+    "vortex",
+]

stubs/skimage/data/__init__.pyi

@@ -1,5 +1,7 @@
 from os import PathLike
 
+def file_hash(fname, alg="sha256") -> str: ...
+
 legacy_data_dir = ...
 skimage_distribution_dir = ...
 
@@ -46,6 +48,7 @@ def hubble_deep_field(): ...
 def retina(): ...
 def shepp_logan_phantom(): ...
 def colorwheel(): ...
+def palisades_of_vogt(): ...
 def rocket(): ...
 def stereo_motorcycle(): ...
 def lfw_subset(): ...

stubs/skimage/data/_fetchers.pyi

@@ -23,29 +23,6 @@ class Hyperparameter(NamedTuple):
     value_type: str
     name: str
 
-    # A raw namedtuple is very memory efficient as it packs the attributes
-    # in a struct to get rid of the __dict__ of attributes in particular it
-    # does not copy the string for the keys on each instance.
-    # By deriving a namedtuple class just to introduce the __init__ method we
-    # would also reintroduce the __dict__ on the instance. By telling the
-    # Python interpreter that this subclass uses static __slots__ instead of
-    # dynamic attributes. Furthermore we don't need any additional slot in the
-    # subclass so we set __slots__ to the empty tuple.
-    __slots__ = ...
-
-    def __new__(
-        cls,
-        name: str,
-        value_type: str,
-        bounds: ndarray | str | tuple[float, int] | tuple[float, float],
-        n_elements: int = 1,
-        fixed=None,
-    ) -> Self: ...
-
-    # This is mainly a testing utility to check that two hyperparameters
-    # are equal.
-    def __eq__(self, other) -> bool: ...
-
 class Kernel(metaclass=ABCMeta):
     def get_params(self, deep: bool = True) -> dict: ...
     def set_params(self, **params) -> Self: ...