Infer dtype of Series in more cases

pandas-stubs/core/frame.pyi

@@ -555,7 +555,7 @@ class DataFrame(NDFrame, OpsMixin):
     @overload
     def __getitem__(  # type: ignore[misc]
         self,
-        key: Series[_bool]
+        key: Series
         | DataFrame
         | Index
         | np_ndarray_str

pandas-stubs/core/indexes/period.pyi

@@ -6,9 +6,7 @@ import numpy as np
 import pandas as pd
 from pandas import Index
 from pandas.core.indexes.accessors import PeriodIndexFieldOps
-from pandas.core.indexes.datetimelike import (
-    DatetimeIndexOpsMixin as DatetimeIndexOpsMixin,
-)
+from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin
 from pandas.core.indexes.timedeltas import TimedeltaIndex
 from typing_extensions import Self
 

pandas-stubs/core/series.pyi

@@ -211,46 +211,51 @@ class _LocIndexerSeries(_LocIndexer, Generic[S1]):
         value: S1 | ArrayLike | Series[S1] | None,
     ) -> None: ...
 
+_ListLike: TypeAlias = (
+    ArrayLike | dict[_str, np.ndarray] | Sequence[S1] | IndexOpsMixin[S1]
+)
+
 class Series(IndexOpsMixin[S1], NDFrame):
-    _ListLike: TypeAlias = ArrayLike | dict[_str, np.ndarray] | list | tuple | Index
     __hash__: ClassVar[None]
 
-    # TODO: can __new__ be converted to __init__? Pandas implements __init__
     @overload
-    def __new__(
+    def __new__(  # type: ignore[misc]
         cls,
-        data: DatetimeIndex | Sequence[Timestamp | np.datetime64 | datetime],
+        data: DatetimeIndex | Sequence[np.datetime64 | datetime],
         index: Axes | None = ...,
+        *,
         dtype: TimestampDtypeArg = ...,
-        name: Hashable | None = ...,
+        name: Hashable = ...,
         copy: bool = ...,
     ) -> TimestampSeries: ...
     @overload
-    def __new__(
+    def __new__(  # type: ignore[misc]
         cls,
         data: _ListLike,
         index: Axes | None = ...,
         *,
         dtype: TimestampDtypeArg,
-        name: Hashable | None = ...,
+        name: Hashable = ...,
         copy: bool = ...,
     ) -> TimestampSeries: ...
     @overload
-    def __new__(
+    def __new__(  # type: ignore[misc]
         cls,
         data: PeriodIndex,
         index: Axes | None = ...,
+        *,
         dtype: PeriodDtype = ...,
-        name: Hashable | None = ...,
+        name: Hashable = ...,
         copy: bool = ...,
     ) -> PeriodSeries: ...
     @overload
-    def __new__(
+    def __new__(  # type: ignore[misc]
         cls,
-        data: TimedeltaIndex | Sequence[Timedelta | np.timedelta64 | timedelta],
+        data: TimedeltaIndex | Sequence[np.timedelta64 | timedelta],
         index: Axes | None = ...,
+        *,
         dtype: TimedeltaDtypeArg = ...,
-        name: Hashable | None = ...,
+        name: Hashable = ...,
         copy: bool = ...,
     ) -> TimedeltaSeries: ...
     @overload
@@ -260,35 +265,39 @@ class Series(IndexOpsMixin[S1], NDFrame):
         | Interval[_OrderableT]
         | Sequence[Interval[_OrderableT]],
         index: Axes | None = ...,
+        *,
         dtype: Literal["Interval"] = ...,
-        name: Hashable | None = ...,
+        name: Hashable = ...,
         copy: bool = ...,
     ) -> IntervalSeries[_OrderableT]: ...
     @overload
     def __new__(
         cls,
-        data: object | _ListLike | Series[S1] | dict[int, S1] | dict[_str, S1] | None,
-        dtype: type[S1],
+        data: object,
         index: Axes | None = ...,
-        name: Hashable | None = ...,
+        *,
+        dtype: type[S1],
+        name: Hashable = ...,
         copy: bool = ...,
     ) -> Self: ...
     @overload
     def __new__(
         cls,
-        data: Series[S1] | dict[int, S1] | dict[_str, S1] = ...,
+        data: _ListLike[S1] | dict[int, S1] | dict[_str, S1],
         index: Axes | None = ...,
+        *,
         dtype: Dtype = ...,
-        name: Hashable | None = ...,
+        name: Hashable = ...,
         copy: bool = ...,
     ) -> Self: ...
     @overload
     def __new__(
         cls,
-        data: object | _ListLike | None = ...,
+        data: object = ...,
         index: Axes | None = ...,
+        *,
         dtype: Dtype = ...,
-        name: Hashable | None = ...,
+        name: Hashable = ...,
         copy: bool = ...,
     ) -> Series: ...
     @property
@@ -342,8 +351,8 @@ class Series(IndexOpsMixin[S1], NDFrame):
         | Series[S1]
         | slice
         | MaskType
-        | tuple[S1 | slice, ...],
-    ) -> Series: ...
+        | tuple[Hashable | slice, ...],
+    ) -> Self: ...
     @overload
     def __getitem__(self, idx: int | _str) -> S1: ...
     def __setitem__(self, key, value) -> None: ...
@@ -676,15 +685,15 @@ class Series(IndexOpsMixin[S1], NDFrame):
     def diff(self, periods: int = ...) -> Series[S1]: ...
     def autocorr(self, lag: int = ...) -> float: ...
     @overload
-    def dot(self, other: Series[S1]) -> Scalar: ...
+    def dot(self, other: Series[S1]) -> Scalar: ...  # type: ignore[misc] # pyright: ignore[reportOverlappingOverload]
     @overload
     def dot(self, other: DataFrame) -> Series[S1]: ...
     @overload
     def dot(self, other: _ListLike) -> np.ndarray: ...
     def __matmul__(self, other): ...
     def __rmatmul__(self, other): ...
     @overload
-    def searchsorted(
+    def searchsorted(  # type: ignore[misc]
         self,
         value: _ListLike,
         side: Literal["left", "right"] = ...,
@@ -781,7 +790,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
         ignore_index: _bool = ...,
         inplace: Literal[False] = ...,
         key: Callable | None = ...,
-    ) -> Series: ...
+    ) -> Self: ...
     @overload
     def sort_index(
         self,
@@ -902,7 +911,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
         inplace: Literal[False] = ...,
         level: Level | None = ...,
         errors: IgnoreRaise = ...,
-    ) -> Series: ...
+    ) -> Self: ...
     @overload
     def rename(
         self,
@@ -913,7 +922,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
         inplace: Literal[False] = ...,
         level: Level | None = ...,
         errors: IgnoreRaise = ...,
-    ) -> Series: ...
+    ) -> Self: ...
     @overload
     def rename(
         self,
@@ -932,7 +941,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
         copy: _bool = ...,
         limit: int | None = ...,
         tolerance: float | None = ...,
-    ) -> Series: ...
+    ) -> Self: ...
     @overload
     def drop(
         self,
@@ -956,7 +965,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
         level: Level | None = ...,
         inplace: Literal[False] = ...,
         errors: IgnoreRaise = ...,
-    ) -> Series: ...
+    ) -> Self: ...
     @overload
     def drop(
         self,
@@ -1344,7 +1353,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
         na_option: Literal["keep", "top", "bottom"] = ...,
         ascending: _bool = ...,
         pct: _bool = ...,
-    ) -> Series: ...
+    ) -> Series[float]: ...
     def where(
         self,
         cond: Series[S1]
@@ -1961,10 +1970,8 @@ class Series(IndexOpsMixin[S1], NDFrame):
         axis: AxisIndex | None = ...,
         copy: _bool = ...,
         inplace: Literal[False] = ...,
-    ) -> Series: ...
-    def set_axis(
-        self, labels, *, axis: Axis = ..., copy: _bool = ...
-    ) -> Series[S1]: ...
+    ) -> Self: ...
+    def set_axis(self, labels, *, axis: Axis = ..., copy: _bool = ...) -> Self: ...
     def __iter__(self) -> Iterator[S1]: ...
 
 class TimestampSeries(Series[Timestamp]):
@@ -2098,7 +2105,7 @@ class TimedeltaSeries(Series[Timedelta]):
         axis: AxisIndex = ...,
         level: Level | None = ...,
         drop_level: _bool = ...,
-    ) -> Series: ...
+    ) -> Self: ...
 
 class PeriodSeries(Series[Period]):
     # ignore needed because of mypy

pyproject.toml

@@ -39,7 +39,7 @@ numpy = [
 ]
 
 [tool.poetry.dev-dependencies]
-mypy = "1.5.0"
+mypy = "1.5.1"
 pandas = "2.0.3"
 pyarrow = ">=10.0.1"
 pytest = ">=7.1.2"