Merge branch 'main' of github.com:pandas-dev/pandas-stubs into feature/reduce-ndarray

Author: cmp0xff

pandas-stubs/_typing.pyi

@@ -1090,7 +1090,7 @@ TimeZones: TypeAlias = str | tzinfo | None | int
 IntoColumn: TypeAlias = (
     AnyArrayLike
     | Scalar
-    | Callable[[DataFrame], AnyArrayLike | Scalar | Sequence[Scalar] | range]
+    | Callable[[DataFrame], AnyArrayLike | Scalar | Sequence[Scalar] | range | None]
     | Sequence[Scalar]
     | range
     | None

tests/indexes/test_datetime_index.py

@@ -35,18 +35,6 @@ def test_index_relops() -> None:
     check(assert_type(data[idx >= x], pd.DatetimeIndex), pd.DatetimeIndex)
     check(assert_type(data[idx > x], pd.DatetimeIndex), pd.DatetimeIndex)
 
-    # TODO: https://github.com/pandas-dev/pandas-stubs/pull/1438#discussion_r2451864012
-    # Can this be de-duplicated?
-    dt_idx = pd.DatetimeIndex(data, name="date")
-    check(assert_type(data[x <= dt_idx], pd.DatetimeIndex), pd.DatetimeIndex)
-    check(assert_type(data[x < dt_idx], pd.DatetimeIndex), pd.DatetimeIndex)
-    check(assert_type(data[x >= dt_idx], pd.DatetimeIndex), pd.DatetimeIndex)
-    check(assert_type(data[x > dt_idx], pd.DatetimeIndex), pd.DatetimeIndex)
-    check(assert_type(data[dt_idx <= x], pd.DatetimeIndex), pd.DatetimeIndex)
-    check(assert_type(data[dt_idx < x], pd.DatetimeIndex), pd.DatetimeIndex)
-    check(assert_type(data[dt_idx >= x], pd.DatetimeIndex), pd.DatetimeIndex)
-    check(assert_type(data[dt_idx > x], pd.DatetimeIndex), pd.DatetimeIndex)
-
     ind = pd.Index([1, 2, 3])
     check(assert_type(ind <= 2, np_1darray[np.bool]), np_1darray[np.bool])
     check(assert_type(ind < 2, np_1darray[np.bool]), np_1darray[np.bool])

tests/test_frame.py

@@ -416,6 +416,10 @@ def my_named_func_2(df: pd.DataFrame) -> pd.Series:
     check(assert_type(df.assign(c=my_named_func_1), pd.DataFrame), pd.DataFrame)
     check(assert_type(df.assign(c=my_named_func_2), pd.DataFrame), pd.DataFrame)
     check(assert_type(df.assign(c=None), pd.DataFrame), pd.DataFrame)
+    check(
+        assert_type(df.assign(foo=lambda df: df.get("abc", None)), pd.DataFrame),
+        pd.DataFrame,
+    )
 
 
 def test_types_sample() -> None: