Merge pull request #500 from numpy/nep50-inexact-simplifications

Author: jorenham

src/_numtype/@test/test_nep50.pyi

@@ -565,4 +565,4 @@ cld_to_f8: CanCast0D[Any, np.clongdouble] = f8  # type: ignore[assignment]  # py
 cld_to_ld: CanCast0D[Any, np.clongdouble] = ld  # type: ignore[assignment]  # pyright: ignore[reportAssignmentType]
 cld_to_c8: CanCast0D[Any, np.clongdouble] = c8  # type: ignore[assignment]  # pyright: ignore[reportAssignmentType]
 cld_to_c16: CanCast0D[Any, np.clongdouble] = c16  # type: ignore[assignment]  # pyright: ignore[reportAssignmentType]
-cld_to_cld: CanCast0D[Any, np.clongdouble] = cld  # type: ignore[assignment]  # pyright: ignore[reportAssignmentType]
+cld_to_cld: CanCast0D[Any, np.clongdouble] = cld  # NOTE: allowing this simplifies the __nep50__ definition

src/_numtype/__init__.pyi

@@ -51,6 +51,8 @@ from ._nep50 import (
     CanCast0D as CanCast0D,
     CanCastND as CanCastND,
     CanNEP50 as CanNEP50,
+    CanNEP50Complex as CanNEP50Complex,
+    CanNEP50Float as CanNEP50Float,
     MatchND as MatchND,
     PromoteWith as PromoteWith,
     PromoteWith0D as PromoteWith0D,

src/_numtype/_nep50.pyi

@@ -7,7 +7,7 @@ from typing_extensions import TypeAliasType, TypeVar
 
 import numpy as np
 
-__all__ = ["CanCast0D", "CanCastND", "CanNEP50", "MatchND", "PromoteWith", "PromoteWith0D"]
+__all__ = ["CanCast0D", "CanCastND", "CanNEP50", "CanNEP50Complex", "CanNEP50Float", "MatchND", "PromoteWith", "PromoteWith0D"]
 
 _T_co = TypeVar("_T_co", covariant=True)
 _BelowT_contra = TypeVar("_BelowT_contra", bound=np.generic, contravariant=True)
@@ -16,6 +16,9 @@ _OtherT_contra = TypeVar("_OtherT_contra", contravariant=True)
 _MatchT_co = TypeVar("_MatchT_co", bound=np.generic, covariant=True, default=Any)
 _ShapeT_co = TypeVar("_ShapeT_co", bound=tuple[int, ...], covariant=True)
 
+_ComplexFloatingT_co = TypeVar("_ComplexFloatingT_co", bound=np.complexfloating, covariant=True)
+_InexactT_co = TypeVar("_InexactT_co", bound=np.inexact, covariant=True)
+
 @type_check_only
 class CanNEP50(Protocol[_BelowT_contra, _AboveT_contra, _MatchT_co]):
     def __nep50__(self, below: _BelowT_contra, above: _AboveT_contra, /) -> _MatchT_co: ...
@@ -44,6 +47,18 @@ class _CanNEP50Rule4(Protocol[_OtherT_contra, _T_co]):
 class _CanNEP50Rule5(Protocol[_OtherT_contra, _T_co]):
     def __nep50_rule5__(self, other: _OtherT_contra, /) -> _T_co: ...
 
+@type_check_only
+class _CanNEP50Rule6(Protocol[_OtherT_contra, _T_co]):
+    def __nep50_rule6__(self, other: _OtherT_contra, /) -> _T_co: ...
+
+@type_check_only
+class CanNEP50Float(Protocol[_InexactT_co]):
+    def __nep50_float__(self, /) -> _InexactT_co: ...
+
+@type_check_only
+class CanNEP50Complex(Protocol[_ComplexFloatingT_co]):
+    def __nep50_complex__(self, /) -> _ComplexFloatingT_co: ...
+
 _WithT = TypeVar("_WithT")
 _OutT = TypeVar("_OutT", bound=np.generic)
 
@@ -55,7 +70,8 @@ PromoteWith = TypeAliasType(
     | _CanNEP50Rule2[_WithT, _OutT]
     | _CanNEP50Rule3[_WithT, _OutT]
     | _CanNEP50Rule4[_WithT, _OutT]
-    | _CanNEP50Rule5[_WithT, _OutT],
+    | _CanNEP50Rule5[_WithT, _OutT]
+    | _CanNEP50Rule6[_WithT, _OutT],
     type_params=(_WithT, _OutT),
 )
 PromoteWith0D = TypeAliasType(