Skip to content

⬆️ bump basedpyright to 1.27.1 (pyright 1.1.394) #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jorenham merged 3 commits into from
Feb 12, 2025
Merged

⬆️ bump basedpyright to 1.27.1 (pyright 1.1.394) #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50324f4
⬆️ bump `basedpyright` to `1.27.1` (pyright 1.1.394)
jorenham Feb 12, 2025
ab7852e
🚨 pyright 1.1.394 regression workaround
jorenham Feb 12, 2025
1720a5f
🚨✨ rewrite `numpy.trapezoid` to work around a pyright 1.1.394 regression
jorenham Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dev = [
"libcst>=1.6.0",
"ruff>=0.9.6",
"mypy[faster-cache]>=1.15.0",
"basedpyright>=1.27.0",
"basedpyright>=1.27.1",
"pytest>=8.3.4",
]

Expand Down
94 changes: 63 additions & 31 deletions src/numpy-stubs/lib/_function_base_impl.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import datetime as dt
from collections.abc import Callable, Iterable, Sequence
from typing import (
Any,
Expand Down Expand Up @@ -78,6 +79,8 @@ __all__ = [
"vectorize",
]

###

_T = TypeVar("_T")
_T_co = TypeVar("_T_co", covariant=True)
_Pss = ParamSpec("_Pss")
Expand All @@ -102,6 +105,14 @@ _MethodKind: TypeAlias = L[
"nearest",
]

_ToFloat64: TypeAlias = float | np.integer | np.bool
_ToFloat64_1d: TypeAlias = Sequence[_ToFloat64] | np.ndarray[tuple[int], np.dtype[np.float64 | np.integer | np.bool]]
_ToJustComplex128_1d: TypeAlias = Sequence[np.complex128] | np.ndarray[tuple[int], np.dtype[np.complex128]]
_ToComplex128: TypeAlias = complex | _ToFloat64
_ToComplex128_1d: TypeAlias = (
Sequence[_ToComplex128] | np.ndarray[tuple[int], np.dtype[np.complex128 | np.float64 | np.integer | np.bool]]
)

@type_check_only
class _SupportsRMulFloat(Protocol[_T_co]):
def __rmul__(self, other: float, /) -> _T_co: ...
Expand Down Expand Up @@ -706,53 +717,74 @@ quantile = percentile

@overload
def trapezoid(
y: Sequence[_FloatLike_co],
x: Sequence[_FloatLike_co] | None = ...,
dx: float = ...,
axis: SupportsIndex = ...,
y: _ToFloat64_1d,
x: _ToFloat64_1d | None = None,
dx: float = 1.0,
axis: SupportsIndex = -1,
) -> np.float64: ...
@overload
def trapezoid(
y: Sequence[_ComplexLike_co],
x: Sequence[_ComplexLike_co] | None = ...,
dx: float = ...,
axis: SupportsIndex = ...,
y: _ToJustComplex128_1d,
x: _ToJustComplex128_1d | None = None,
dx: complex = 1.0,
axis: SupportsIndex = -1,
) -> np.complex128: ...
@overload
def trapezoid( # type: ignore[overload-overlap]
y: _ToComplex128_1d,
x: _ToComplex128_1d | None = None,
dx: complex = 1.0,
axis: SupportsIndex = -1,
) -> np.float64 | np.complex128: ...
@overload
def trapezoid(
y: _ArrayLike[np.bool_ | np.integer],
x: _ArrayLike[np.bool_ | np.integer] | None = ...,
dx: float = ...,
axis: SupportsIndex = ...,
) -> np.float64 | NDArray[np.float64]: ...
y: Sequence[dt.timedelta],
x: Sequence[dt.timedelta] | _ArrayLikeFloat_co | None = None,
dx: complex = 1.0,
axis: SupportsIndex = -1,
) -> np.complex128: ...
@overload
def trapezoid(
y: _ArrayLikeObject_co,
x: _ArrayLikeFloat_co | _ArrayLikeObject_co | None = ...,
dx: float = ...,
axis: SupportsIndex = ...,
) -> float | NDArray[np.object_]: ...
y: Sequence[_SupportsRMulFloat[float]],
x: Sequence[_SupportsRMulFloat[float] | float] | None = None,
dx: float = 1.0,
axis: SupportsIndex = -1,
) -> float: ...
@overload
def trapezoid(
y: Sequence[_SupportsRMulFloat[_T]],
x: Sequence[_SupportsRMulFloat[_T]] | Sequence[_T] | None = None,
dx: float = 1.0,
axis: SupportsIndex = -1,
) -> _T: ...
@overload
def trapezoid( # type: ignore[overload-overlap]
y: _ArrayLike[_SCT_fcm],
x: _ArrayLike[_SCT_fcm] | _ArrayLikeInt_co | None = ...,
dx: float = ...,
axis: SupportsIndex = ...,
x: _ArrayLike[_SCT_fcm] | _ArrayLikeInt_co | None = None,
dx: float = 1.0,
axis: SupportsIndex = -1,
) -> _SCT_fcm | NDArray[_SCT_fcm]: ...
@overload
def trapezoid(
y: Sequence[_SupportsRMulFloat[_T]],
x: Sequence[_SupportsRMulFloat[_T] | _T] | None = ...,
dx: float = ...,
axis: SupportsIndex = ...,
) -> _T: ...
y: _ArrayLikeInt_co,
x: _ArrayLikeInt_co | None = None,
dx: float = 1.0,
axis: SupportsIndex = -1,
) -> np.float64 | NDArray[np.float64]: ...
@overload
def trapezoid(
y: _ArrayLikeComplex_co | _ArrayLikeTD64_co | _ArrayLikeObject_co,
x: _ArrayLikeComplex_co | _ArrayLikeTD64_co | _ArrayLikeObject_co | None = ...,
dx: float = ...,
axis: SupportsIndex = ...,
) -> np.inexact | np.timedelta64 | NDArray[np.inexact | np.timedelta64 | np.object_]: ...
y: _ArrayLikeTD64_co,
x: _ArrayLikeTD64_co | None = None,
dx: float = 1.0,
axis: SupportsIndex = -1,
) -> np.float64 | np.timedelta64 | NDArray[np.float64 | np.timedelta64]: ...
@overload
def trapezoid(
y: _ArrayLikeObject_co,
x: _ArrayLikeFloat_co | _ArrayLikeObject_co | None = None,
dx: float = 1.0,
axis: SupportsIndex = -1,
) -> Any: ...

#
@deprecated("Use 'trapezoid' instead")
Expand Down
19 changes: 6 additions & 13 deletions test/static/accept/lib_function_base.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,7 @@ CHAR_AR_U: np.char.chararray[tuple[int, ...], np.dtype[np.str_]]

AR_b_list: list[npt.NDArray[np.bool]]

def func(
a: npt.NDArray[Any],
posarg: bool = ...,
/,
arg: int = ...,
*,
kwarg: str = ...,
) -> npt.NDArray[Any]: ...
def func(a: npt.NDArray[Any], posarg: bool = ..., /, arg: int = ..., *, kwarg: str = ...) -> npt.NDArray[Any]: ...

assert_type(vectorized_func.pyfunc, Callable[..., Any])
assert_type(vectorized_func.cache, bool)
Expand Down Expand Up @@ -181,18 +174,18 @@ assert_type(np.quantile(AR_f8, [0.5], out=AR_c16), npt.NDArray[np.complex128])

assert_type(np.trapezoid(AR_LIKE_f8), np.float64)
assert_type(np.trapezoid(AR_LIKE_f8, AR_LIKE_f8), np.float64)
assert_type(np.trapezoid(AR_LIKE_c16), np.complex128)
assert_type(np.trapezoid(AR_LIKE_c16, AR_LIKE_f8), np.complex128)
assert_type(np.trapezoid(AR_LIKE_f8, AR_LIKE_c16), np.complex128)
assert_type(np.trapezoid(AR_LIKE_c16), np.float64 | np.complex128)
assert_type(np.trapezoid(AR_LIKE_c16, AR_LIKE_f8), np.float64 | np.complex128)
assert_type(np.trapezoid(AR_LIKE_f8, AR_LIKE_c16), np.float64 | np.complex128)
assert_type(np.trapezoid(AR_LIKE_O), float)
assert_type(np.trapezoid(AR_LIKE_O, AR_LIKE_f8), float)
assert_type(np.trapezoid(AR_f8), np.float64 | npt.NDArray[np.float64])
assert_type(np.trapezoid(AR_f8, AR_f8), np.float64 | npt.NDArray[np.float64])
assert_type(np.trapezoid(AR_c16), np.complex128 | npt.NDArray[np.complex128])
assert_type(np.trapezoid(AR_c16, AR_c16), np.complex128 | npt.NDArray[np.complex128])
assert_type(np.trapezoid(AR_m), np.timedelta64 | npt.NDArray[np.timedelta64])
assert_type(np.trapezoid(AR_O), float | npt.NDArray[np.object_])
assert_type(np.trapezoid(AR_O, AR_LIKE_f8), float | npt.NDArray[np.object_])
assert_type(np.trapezoid(AR_O), Any)
assert_type(np.trapezoid(AR_O, AR_LIKE_f8), Any)

assert_type(np.meshgrid(AR_f8, AR_i8, copy=False), tuple[npt.NDArray[Any], ...])
assert_type(np.meshgrid(AR_f8, AR_i8, AR_c16, indexing="ij"), tuple[npt.NDArray[Any], ...])
Expand Down
73 changes: 35 additions & 38 deletions test/static/accept/mod.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,27 @@ assert_type(m_td % m_td, np.timedelta64[dt.timedelta | None])
assert_type(AR_m % m, npt.NDArray[np.timedelta64])
assert_type(m % AR_m, npt.NDArray[np.timedelta64])

assert_type(divmod(m, m), tuple[np.int64, np.timedelta64])
assert_type(divmod(m, m_nat), tuple[np.int64, np.timedelta64[None]])
assert_type(divmod(m, m_int0), tuple[np.int64, np.timedelta64[None]])
# workarounds for https://github.com/microsoft/pyright/issues/9663
# NOTE: `builtins.divmod` cannot be used because of
# https://github.com/microsoft/pyright/issues/9896

assert_type(m.__divmod__(m), tuple[np.int64, np.timedelta64])
assert_type(m.__divmod__(m_nat), tuple[np.int64, np.timedelta64[None]])
assert_type(m.__divmod__(m_int0), tuple[np.int64, np.timedelta64[None]])
assert_type(m.__divmod__(m_int), tuple[np.int64, np.timedelta64[int | None]])
assert_type(divmod(m_nat, m), tuple[np.int64, np.timedelta64[None]])
assert_type(divmod(m_int, m_nat), tuple[np.int64, np.timedelta64[None]])
assert_type(divmod(m_int, m_int0), tuple[np.int64, np.timedelta64[None]])
assert_type(divmod(m_int, m_int), tuple[np.int64, np.timedelta64[int | None]])
assert_type(divmod(m_int, m_td), tuple[np.int64, np.timedelta64[int | None]])
assert_type(divmod(m_td, m_nat), tuple[np.int64, np.timedelta64[None]])
assert_type(divmod(m_td, m_int0), tuple[np.int64, np.timedelta64[None]])
assert_type(divmod(m_td, m_int), tuple[np.int64, np.timedelta64[int | None]])
assert_type(divmod(m_td, m_td), tuple[np.int64, np.timedelta64[dt.timedelta | None]])
assert_type(m_nat.__divmod__(m), tuple[np.int64, np.timedelta64[None]])
assert_type(m_int.__divmod__(m_nat), tuple[np.int64, np.timedelta64[None]])
assert_type(m_int.__divmod__(m_int0), tuple[np.int64, np.timedelta64[None]])
assert_type(m_int.__divmod__(m_int), tuple[np.int64, np.timedelta64[int | None]])
assert_type(m_int.__divmod__(m_td), tuple[np.int64, np.timedelta64[int | None]])
assert_type(m_td.__divmod__(m_nat), tuple[np.int64, np.timedelta64[None]])
assert_type(m_td.__divmod__(m_int0), tuple[np.int64, np.timedelta64[None]])
assert_type(m_td.__divmod__(m_int), tuple[np.int64, np.timedelta64[int | None]])
assert_type(m_td.__divmod__(m_td), tuple[np.int64, np.timedelta64[dt.timedelta | None]])

assert_type(divmod(AR_m, m), tuple[npt.NDArray[np.int64], npt.NDArray[np.timedelta64]])
assert_type(divmod(m, AR_m), tuple[npt.NDArray[np.int64], npt.NDArray[np.timedelta64]])

# Bool

assert_type(b_ % b, np.int8)
assert_type(b_ % i, np.int8 | np.int_)
assert_type(b_ % f, np.int8 | np.int_ | np.float64)
Expand All @@ -76,15 +77,14 @@ assert_type(b_ % u8, np.uint64)
assert_type(b_ % f8, np.float64)
assert_type(b_ % AR_b, npt.NDArray[np.int8])

assert_type(divmod(b_, b_), tuple[np.int8, np.int8])
# workarounds for https://github.com/microsoft/pyright/issues/9663
assert_type(b_.__divmod__(b_), tuple[np.int8, np.int8])
assert_type(b_.__divmod__(b), tuple[np.int8, np.int8])
assert_type(b_.__divmod__(i), tuple[np.int8, np.int8] | tuple[np.int_, np.int_])
assert_type(b_.__divmod__(f), tuple[np.int8, np.int8] | tuple[np.int_, np.int_] | tuple[np.float64, np.float64])
assert_type(b_.__divmod__(i8), tuple[np.int64, np.int64])
assert_type(b_.__divmod__(u8), tuple[np.uint64, np.uint64])
assert_type(divmod(b_, f8), tuple[np.float64, np.float64])
assert_type(divmod(b_, AR_b), tuple[npt.NDArray[np.int8], npt.NDArray[np.int8]])
assert_type(b_.__divmod__(f8), tuple[np.float64, np.float64])
# assert_type(b_.__divmod__(AR_b), tuple[np.float64, np.float64])

assert_type(b % b_, np.int8)
assert_type(i % b_, np.int8 | np.int_)
Expand All @@ -95,14 +95,14 @@ assert_type(u8 % b_, np.uint64)
assert_type(f8 % b_, np.float64)
assert_type(AR_b % b_, npt.NDArray[np.int8])

assert_type(divmod(b, b_), tuple[np.int8, np.int8])
assert_type(divmod(i, b_), tuple[np.int8, np.int8] | tuple[np.int_, np.int_])
assert_type(divmod(f, b_), tuple[np.int8, np.int8] | tuple[np.int_, np.int_] | tuple[np.float64, np.float64])
assert_type(divmod(b_, b_), tuple[np.int8, np.int8])
assert_type(divmod(i8, b_), tuple[np.int64, np.int64])
assert_type(divmod(u8, b_), tuple[np.uint64, np.uint64])
assert_type(divmod(f8, b_), tuple[np.float64, np.float64])
assert_type(divmod(AR_b, b_), tuple[npt.NDArray[np.int8], npt.NDArray[np.int8]])
assert_type(b_.__rdivmod__(b), tuple[np.int8, np.int8])
assert_type(b_.__rdivmod__(i), tuple[np.int8, np.int8] | tuple[np.int_, np.int_])
assert_type(b_.__rdivmod__(f), tuple[np.int8, np.int8] | tuple[np.int_, np.int_] | tuple[np.float64, np.float64])
assert_type(b_.__rdivmod__(b_), tuple[np.int8, np.int8])
assert_type(b_.__rdivmod__(i8), tuple[np.int64, np.int64])
assert_type(b_.__rdivmod__(u8), tuple[np.uint64, np.uint64])
assert_type(b_.__rdivmod__(f8), tuple[np.float64, np.float64])
assert_type(AR_b.__rdivmod__(b_), tuple[npt.NDArray[np.int8], npt.NDArray[np.int8]])

# int

Expand All @@ -117,17 +117,16 @@ assert_type(i4 % i4, np.int32)
assert_type(i4 % f4, np.float32)
assert_type(i8 % AR_b, npt.NDArray[np.int64])

# workarounds for https://github.com/microsoft/pyright/issues/9663
assert_type(i8.__divmod__(b), tuple[np.int64, np.int64])
assert_type(i8.__divmod__(i), tuple[np.int64, np.int64])
assert_type(i8.__divmod__(f), tuple[np.int64, np.int64] | tuple[np.float64, np.float64])
assert_type(i8.__divmod__(i4), tuple[np.int64, np.int64])
assert_type(i8.__divmod__(i8), tuple[np.int64, np.int64])
assert_type(i8.__divmod__(f8), tuple[np.float64, np.float64])
assert_type(i8.__divmod__(f4), tuple[np.float64, np.float64])
assert_type(divmod(i4, i4), tuple[np.int32, np.int32])
assert_type(divmod(i4, f4), tuple[np.float32, np.float32])
assert_type(divmod(i8, AR_b), tuple[npt.NDArray[np.int64], npt.NDArray[np.int64]])
assert_type(i4.__divmod__(i4), tuple[np.int32, np.int32])
# assert_type(divmod(i4, f4), tuple[np.float32, np.float32])
# assert_type(divmod(i8, AR_b), tuple[npt.NDArray[np.int64], npt.NDArray[np.int64]])

assert_type(b % i8, np.int64)
assert_type(f % i8, np.int64 | np.float64)
Expand All @@ -139,12 +138,11 @@ assert_type(i4 % i4, np.int32)
assert_type(f4 % i4, np.float32)
assert_type(AR_b % i8, npt.NDArray[np.int64])

assert_type(divmod(b, i8), tuple[np.int64, np.int64])
assert_type(divmod(f, i8), tuple[np.int64, np.int64] | tuple[np.float64, np.float64])
assert_type(divmod(i8, i8), tuple[np.int64, np.int64])
assert_type(divmod(f8, i8), tuple[np.float64, np.float64])
assert_type(divmod(i4, i4), tuple[np.int32, np.int32])
# workarounds for https://github.com/microsoft/pyright/issues/9663
assert_type(i8.__divmod__(b), tuple[np.int64, np.int64])
assert_type(i8.__divmod__(f), tuple[np.int64, np.int64] | tuple[np.float64, np.float64])
assert_type(i8.__divmod__(i8), tuple[np.int64, np.int64])
assert_type(i8.__divmod__(f8), tuple[np.float64, np.float64])
# assert_type(i8.__divmod__(i4), tuple[np.int32, np.int32])
assert_type(i4.__divmod__(i8), tuple[np.int64, np.int64])
assert_type(f4.__divmod__(i8), tuple[np.float64, np.float64])
assert_type(f4.__divmod__(i4), tuple[np.float32, np.float32])
Expand All @@ -163,7 +161,7 @@ assert_type(divmod(f8, f), tuple[np.float64, np.float64])
assert_type(divmod(f8, f8), tuple[np.float64, np.float64])
assert_type(divmod(f8, f4), tuple[np.float64, np.float64])
assert_type(divmod(f4, f4), tuple[np.float32, np.float32])
assert_type(divmod(f8, AR_b), tuple[npt.NDArray[np.float64], npt.NDArray[np.float64]])
assert_type(AR_b.__rdivmod__(f8), tuple[npt.NDArray[np.float64], npt.NDArray[np.float64]])

assert_type(b % f8, np.float64)
assert_type(f % f8, np.float64) # pyright: ignore[reportAssertTypeFailure] # pyright incorrectly infers `builtins.float`
Expand All @@ -175,7 +173,6 @@ assert_type(AR_b % f8, npt.NDArray[np.float64])
assert_type(divmod(b, f8), tuple[np.float64, np.float64])
assert_type(divmod(f8, f8), tuple[np.float64, np.float64])
assert_type(divmod(f4, f4), tuple[np.float32, np.float32])
# workarounds for https://github.com/microsoft/pyright/issues/9663
assert_type(f8.__rdivmod__(f), tuple[np.float64, np.float64])
assert_type(f8.__rdivmod__(f4), tuple[np.float64, np.float64])
assert_type(AR_b.__divmod__(f8), tuple[npt.NDArray[np.float64], npt.NDArray[np.float64]])
Loading
Loading