Merge pull request #507 from numpy/testgen/less-aggressive-join

Author: jorenham

src/numpy-stubs/@test/generated/ndarray_ops_add.pyi

@@ -4714,15 +4714,15 @@ class number(
 
     #
     @overload
-    def __truediv__(self, x: _nt.CoFloating_0d | _nt.CastsScalar[Self] | _JustNumber, /) -> inexact: ...
+    def __truediv__(self, x: _nt.CoFloat64_0d | _nt.CastsScalar[Self] | _JustNumber, /) -> inexact: ...
     @overload
     def __truediv__(self, x: _nt.CastsWithScalar[Self, _InexactT], /) -> _InexactT: ...
     @overload
     def __truediv__(self: _nt.CastsWithComplex[_ComplexFloatingT], x: _nt.JustComplex, /) -> _ComplexFloatingT: ...
 
     #
     @overload
-    def __rtruediv__(self, x: _nt.CoFloating_0d | _nt.CastsScalar[Self] | _JustNumber, /) -> inexact: ...
+    def __rtruediv__(self, x: _nt.CoFloat64_0d | _nt.CastsScalar[Self] | _JustNumber, /) -> inexact: ...
     @overload
     def __rtruediv__(self, x: _nt.CastsWithScalar[Self, _InexactT], /) -> _InexactT: ...
     @overload
@@ -5136,9 +5136,6 @@ class floating(_RealMixin, _RoundMixin, inexact[_BitT, float]):
     @override
     @type_check_only
     def __nep50_rule3__(self, other: _JustFloating, /) -> floating: ...
-    @override
-    @type_check_only
-    def __nep50_rule4__(self, other: _JustComplexFloating, /) -> complexfloating: ...
 
     #
     @override
@@ -5245,7 +5242,12 @@ double = float64
 class longdouble(_FloatMixin[L[12, 16]], floating[_n._64L]):
     @override
     @type_check_only
-    def __nep50__(self, below: _nt.inexact64l, above: _float64_max | _nt.co_integer, /) -> longdouble: ...
+    def __nep50__(
+        self,
+        below: longdouble | clongdouble,
+        above: _nt.co_float64,
+        /,
+    ) -> longdouble: ...
     @override
     @type_check_only
     def __nep50_complex__(self, /) -> clongdouble: ...
@@ -5255,6 +5257,9 @@ class longdouble(_FloatMixin[L[12, 16]], floating[_n._64L]):
     @override
     @type_check_only
     def __nep50_rule4__(self, other: complexfloating | _JustComplexFloating, /) -> clongdouble: ...
+    @override
+    @type_check_only
+    def __nep50_rule6__(self, other: _JustInexact | _JustNumber, /) -> longdouble | clongdouble: ...
 
     #
     @overload

src/numpy-stubs/@test/generated/scalar_ops_arithmetic.pyi

@@ -262,10 +262,18 @@ def _union(*types: str) -> str:
 
 def _join(*types: str) -> str:
     """Find the common base type, i.e. union + upcast."""
+    if len(types) == 1:
+        return types[0]
+
     numbers, other = __group_types(*types)
     if other and numbers:
         raise NotImplementedError(f"join of non-number types: {types}")
 
+    if len(types) == len(numbers) == 2 and not other:
+        # union two types if they're different kinds, e.g. `np.int8 | np.uint8` instead
+        # of `np.integer`
+        return " | ".join(kind_types[0] for kind_types in numbers.values())
+
     # special case for accidental `bool` return from `timedelta64.__eq__` on numpy <2.3
     if not numbers and len(other) == 2 and set(other) == {f"{NP}.bool", "bool"}:
         return f"{NP}.bool"