See if renaming variables work

Author: hamdanal

pandas-stubs/_libs/tslibs/timestamps.pyi

@@ -45,7 +45,6 @@ from pandas._typing import (
     TimeUnit,
     np_1darray,
     np_ndarray,
-    npt,
 )
 
 _Ambiguous: TypeAlias = bool | Literal["raise", "NaT"]
@@ -259,8 +258,8 @@ class Timestamp(datetime, SupportsIndex):
     def __eq__(self, other: TimestampSeries) -> Series[bool]: ...  # type: ignore[overload-overlap]
     @overload
     def __eq__(self, other: Index) -> np_1darray[np.bool]: ...  # type: ignore[overload-overlap]
-    @overload  # TODO: using shape-aware arrays similar to other methods doesn't work in mypy
-    def __eq__(self, other: npt.NDArray[np.datetime64]) -> npt.NDArray[np.bool]: ...  # type: ignore[overload-overlap]
+    @overload
+    def __eq__(self, other: np_ndarray[ShapeT, np.datetime64]) -> np_ndarray[ShapeT, np.bool]: ...  # type: ignore[overload-overlap]
     @overload
     def __eq__(self, other: object) -> Literal[False]: ...
     @overload
@@ -269,8 +268,8 @@ class Timestamp(datetime, SupportsIndex):
     def __ne__(self, other: TimestampSeries) -> Series[bool]: ...  # type: ignore[overload-overlap]
     @overload
     def __ne__(self, other: Index) -> np_1darray[np.bool]: ...  # type: ignore[overload-overlap]
-    @overload  # TODO: using shape-aware arrays similar to other methods doesn't work in mypy
-    def __ne__(self, other: npt.NDArray[np.datetime64]) -> npt.NDArray[np.bool]: ...  # type: ignore[overload-overlap]
+    @overload
+    def __ne__(self, other: np_ndarray[ShapeT, np.datetime64]) -> np_ndarray[ShapeT, np.bool]: ...  # type: ignore[overload-overlap]
     @overload
     def __ne__(self, other: object) -> Literal[True]: ...
     def __hash__(self) -> int: ...

pandas-stubs/core/dtypes/missing.pyi

@@ -52,7 +52,7 @@ def notna(obj: Index | ExtensionArray | list[ScalarT]) -> np_1darray[np.bool]: .
 @overload
 def notna(obj: np_ndarray[ShapeT]) -> np_ndarray[ShapeT, np.bool]: ...
 @overload
-def notna(obj: Index | list[Any]) -> np_ndarray_bool: ...
+def notna(obj: list[Any]) -> np_ndarray_bool: ...
 @overload
 def notna(obj: ScalarT | NaTType | NAType | None) -> TypeIs[ScalarT]: ...
 

tests/__init__.py

@@ -11,6 +11,7 @@
     TYPE_CHECKING,
     Final,
     Literal,
+    TypeAlias,
     TypeVar,
     get_args,
     get_origin,
@@ -51,10 +52,10 @@
 else:
     _G = TypeVar("_G", bound=np.generic)
     # Separately define here so pytest works
-    np_1darray = np.ndarray[tuple[int], np.dtype[_G]]
-    np_2darray = np.ndarray[tuple[int, int], np.dtype[_G]]
-    np_ndarray_bool = npt.NDArray[np.bool_]
-    np_ndarray_int = npt.NDArray[np.signedinteger]
+    np_1darray: TypeAlias = np.ndarray[tuple[int], np.dtype[_G]]
+    np_2darray: TypeAlias = np.ndarray[tuple[int, int], np.dtype[_G]]
+    np_ndarray_bool: TypeAlias = npt.NDArray[np.bool_]
+    np_ndarray_int: TypeAlias = npt.NDArray[np.signedinteger]
 
 TYPE_CHECKING_INVALID_USAGE: Final = TYPE_CHECKING
 WINDOWS = os.name == "nt" or "cygwin" in platform.system().lower()

tests/test_scalars.py

@@ -2,7 +2,6 @@
 
 import datetime
 import datetime as dt
-import sys
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -52,8 +51,6 @@
     PeriodSeries: TypeAlias = pd.Series
     OffsetSeries: TypeAlias = pd.Series
 
-MYPY = False
-
 
 def test_interval() -> None:
     interval_i = pd.Interval(0, 1, closed="left")
@@ -1375,55 +1372,52 @@ def test_timestamp_cmp() -> None:
     ne = check(assert_type(ts != c_dt_datetime, bool), bool)
     assert eq != ne
 
-    eq_arr = check(
+    eq_arr1 = check(
         assert_type(ts == c_datetimeindex, np_1darray[np.bool]), np_1darray[np.bool]
     )
-    ne_arr = check(
+    ne_arr1 = check(
         assert_type(ts != c_datetimeindex, np_1darray[np.bool]), np_1darray[np.bool]
     )
-    assert (eq_arr != ne_arr).all()
-    eq_arr = check(
+    assert (eq_arr1 != ne_arr1).all()
+    eq_arr2 = check(
         assert_type(ts == c_unknown_index, np_1darray[np.bool]), np_1darray[np.bool]
     )
-    ne_arr = check(
+    ne_arr2 = check(
         assert_type(ts != c_unknown_index, np_1darray[np.bool]), np_1darray[np.bool]
     )
-    assert (eq_arr != ne_arr).all()
+    assert (eq_arr2 != ne_arr2).all()
 
-    if sys.version_info >= (3, 11) or not MYPY:
-        # tests in this block fail with mypy on Python 3.10 in CI only
-        # I couldn't reproduce the failure locally so skip mypy on Python 3.10
-        eq_arr = check(
-            assert_type(ts == c_np_ndarray_dt64, np_ndarray_bool), np.ndarray, np.bool_
-        )
-        ne_arr = check(
-            assert_type(ts != c_np_ndarray_dt64, np_ndarray_bool), np.ndarray, np.bool_
-        )
-        assert (eq_arr != ne_arr).all()
-        # TODO: the following should be 2D-arrays but it doesn't work in mypy
-        eq_arr = check(
-            assert_type(ts == c_np_2darray_dt64, np_ndarray_bool), np_ndarray_bool
-        )
-        ne_arr = check(
-            assert_type(ts != c_np_2darray_dt64, np_ndarray_bool), np_ndarray_bool
-        )
-        assert (eq_arr != ne_arr).all()
+    eq_arr3 = check(
+        assert_type(ts == c_np_ndarray_dt64, np_ndarray_bool), np.ndarray, np.bool_
+    )
+    ne_arr3 = check(
+        assert_type(ts != c_np_ndarray_dt64, np_ndarray_bool), np.ndarray, np.bool_
+    )
+    assert (eq_arr3 != ne_arr3).all()
 
-    eq_s = check(
+    eq_arr4 = check(
+        assert_type(ts == c_np_2darray_dt64, np_2darray[np.bool]), np_2darray[np.bool]
+    )
+    ne_arr4 = check(
+        assert_type(ts != c_np_2darray_dt64, np_2darray[np.bool]), np_2darray[np.bool]
+    )
+    assert (eq_arr4 != ne_arr4).all()
+
+    eq_s1 = check(
         assert_type(ts == c_series_timestamp, "pd.Series[bool]"), pd.Series, np.bool_
     )
-    ne_s = check(
+    ne_s1 = check(
         assert_type(ts != c_series_timestamp, "pd.Series[bool]"), pd.Series, np.bool_
     )
-    assert (eq_s != ne_s).all()
+    assert (eq_s1 != ne_s1).all()
 
-    eq_s = check(
+    eq_s2 = check(
         assert_type(ts == c_series_dt64, "pd.Series[bool]"), pd.Series, np.bool_
     )
-    ne_s = check(
+    ne_s2 = check(
         assert_type(ts != c_series_dt64, "pd.Series[bool]"), pd.Series, np.bool_
     )
-    assert (eq_s != ne_s).all()
+    assert (eq_s2 != ne_s2).all()
 
 
 def test_timestamp_eq_ne_rhs() -> None: