Fix all reportAssertTypeFailure+reportGeneralTypeIssues

Author: Avasam

out/sklearn/utils/fixes.pyi

@@ -0,0 +1,24 @@
+from _typeshed import Incomplete
+from numpy import ComplexWarning as ComplexWarning, VisibleDeprecationWarning as VisibleDeprecationWarning
+from scipy.integrate import trapz as trapezoid
+from scipy.optimize.linesearch import line_search_wolfe1 as line_search_wolfe1, line_search_wolfe2 as line_search_wolfe2
+from scipy.sparse import csr_array as csr_array, sparray as sparray
+from scipy.sparse.csgraph import laplacian as laplacian
+
+np_version: Incomplete
+np_base_version: Incomplete
+sp_version: Incomplete
+sp_base_version: Incomplete
+CSR_CONTAINERS: Incomplete
+CSC_CONTAINERS: Incomplete
+COO_CONTAINERS: Incomplete
+LIL_CONTAINERS: Incomplete
+DOK_CONTAINERS: Incomplete
+BSR_CONTAINERS: Incomplete
+DIA_CONTAINERS: Incomplete
+SPARRAY_PRESENT: bool
+SPARSE_ARRAY_PRESENT: bool
+percentile: Incomplete
+
+def pd_fillna(pd, frame): ...
+def tarfile_extractall(tarfile, path) -> None: ...

pyproject.toml

@@ -84,6 +84,7 @@ extra-standard-library = [
 
 [tool.pyright]
 exclude = ["build", ".git"]
+stubPath = "./stubs"
 # Target oldest supported Python version
 pythonversion = "3.9"
 typeCheckingMode = "standard"
@@ -108,10 +109,6 @@ reportSelfClsParameterName = false
 # Not an error by default in standard mode
 reportUnsupportedDunderAll = "error"
 
-# Error reports to fix in code
-reportAssertTypeFailure = "none" # TODO
-reportGeneralTypeIssues = "none" # TODO
-
 [tool.mypy]
 # Target oldest supported Python version
 python_version = "3.9"

stubs/matplotlib/figure.pyi

@@ -75,7 +75,8 @@ class FigureBase(Artist):
     def add_artist(self, artist: Artist, clip: bool = False) -> Artist: ...
     def add_axes(self, *args, **kwargs) -> Axes: ...
     @overload
-    def add_subplot(self, *args, projection: Literal["3d"], **kwargs) -> Axes3D: ...
+    # Decorators make this look like a callable. This is an upstream issue
+    def add_subplot(self, *args, projection: Literal["3d"], **kwargs) -> Axes3D: ... # pyright: ignore[reportGeneralTypeIssues]
     @overload
     def add_subplot(self, *args, projection: Literal["aitoff"], **kwargs) -> AitoffAxes: ...
     @overload

stubs/sklearn/utils/fixes.pyi

@@ -1,43 +1,23 @@
-import sys
-from importlib import resources as resources
-from typing import Literal, Mapping
-
-import numpy as np
-import scipy
-import scipy.stats
-import sklearn
-import threadpoolctl
-from numpy import percentile as percentile
-from scipy.linalg import eigh as _eigh
-from scipy.optimize._linesearch import (  # explicitly re-exported
-    line_search_wolfe1 as line_search_wolfe1,
-    line_search_wolfe2 as line_search_wolfe2,
-)
-from threadpoolctl import _ThreadpoolLimiter
-
-from ..externals._lobpcg import lobpcg as lobpcg
-from ..externals._packaging.version import parse as parse_version
-from .deprecation import deprecated
-from .parallel import delayed
+# Version-based re-exports
+from numpy import ComplexWarning as ComplexWarning, VisibleDeprecationWarning as VisibleDeprecationWarning
+from scipy.integrate import trapezoid as trapezoid
+from scipy.optimize._linesearch import line_search_wolfe1 as line_search_wolfe1, line_search_wolfe2 as line_search_wolfe2
+from scipy.sparse.csgraph import laplacian as laplacian
 
 np_version = ...
+np_base_version = ...
 sp_version = ...
-
-class loguniform(scipy.stats.reciprocal): ...
-
-def threadpool_limits(
-    limits: None | Mapping | str | int = None,
-    user_api: None | Literal["blas", "openmp"] = None,
-) -> _ThreadpoolLimiter: ...
-
-threadpool_limits.__doc__ = ...
-
-def threadpool_info() -> list[dict[str, int | str] | dict[str, str | None | int]]: ...
-
-threadpool_info.__doc__ = ...
-
-@deprecated(
-    "The function `delayed` has been moved from `sklearn.utils.fixes` to "
-    "`sklearn.utils.parallel`. This import path will be removed in 1.5."
-)
-def delayed(function): ...
+sp_base_version = ...
+CSR_CONTAINERS = ...
+CSC_CONTAINERS = ...
+COO_CONTAINERS = ...
+LIL_CONTAINERS = ...
+DOK_CONTAINERS = ...
+BSR_CONTAINERS = ...
+DIA_CONTAINERS = ...
+SPARRAY_PRESENT: bool
+SPARSE_ARRAY_PRESENT: bool
+percentile = ...
+
+def pd_fillna(pd, frame): ...
+def tarfile_extractall(tarfile, path) -> None: ...

stubs/sympy-stubs/polys/domains/gmpyintegerring.pyi

@@ -9,7 +9,7 @@ class GMPYIntegerRing(IntegerRing):
     dtype = GMPYInteger
     zero = dtype(0)
     one = dtype(1)
-    tp = type(one)
+    tp: type[dtype]
     alias = ...
     def __init__(self) -> None: ...
     def to_sympy(self, a) -> Integer: ...

stubs/sympy-stubs/polys/domains/gmpyrationalfield.pyi

@@ -9,7 +9,7 @@ class GMPYRationalField(RationalField):
     dtype = GMPYRational
     zero = dtype(0)
     one = dtype(1)
-    tp = type(one)
+    tp: type[dtype]
     alias = ...
     def __init__(self) -> None: ...
     def get_ring(self) -> Any: ...

stubs/sympy-stubs/polys/domains/integerring.pyi

@@ -13,7 +13,7 @@ class IntegerRing(Ring, CharacteristicZero, SimpleDomain):  # type: ignore
     dtype = MPZ
     zero = dtype(0)
     one = dtype(1)
-    tp = type(one)
+    tp: type[dtype]
     is_ZZ = ...
     is_Numerical = ...
     is_PID = ...

stubs/sympy-stubs/polys/domains/rationalfield.pyi

@@ -19,7 +19,7 @@ class RationalField(Field, CharacteristicZero, SimpleDomain):
     dtype = MPQ
     zero = dtype(0)
     one = dtype(1)
-    tp = type(one)
+    tp: type[dtype]
     def __init__(self) -> None: ...
     def get_ring(self) -> Any: ...
     def to_sympy(self, a) -> Rational | Integer: ...

utils/validate_stubs.py

@@ -1,4 +1,5 @@
 #!/bin/python
+from __future__ import annotations
 
 __doc__ = """Validate Stubs.
 
@@ -14,7 +15,6 @@
   --function=<f>     Restrict to the named function (or method if used with --class).
   --class=<c>        Restrict to the named class.
 """
-from __future__ import annotations
 
 import importlib
 import importlib.machinery