Merge branch 'main' into hotfix/cmp0xff/1372-cumprod

Author: cmp0xff

pandas-stubs/core/frame.pyi

@@ -549,9 +549,9 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
             | Mapping[str, Any]
             | Mapping[str, SequenceNotStr[Any]]
         ),
-        index: str | SequenceNotStr[Hashable] | None = None,
-        columns: ListLike | None = None,
+        index: str | Axes | None = None,
         exclude: ListLike | None = None,
+        columns: ListLike | None = None,
         coerce_float: bool = False,
         nrows: int | None = None,
     ) -> Self: ...

pandas-stubs/core/indexes/datetimes.pyi

@@ -20,6 +20,7 @@ from pandas import (
     TimedeltaIndex,
     Timestamp,
 )
+from pandas.core.arrays import DatetimeArray
 from pandas.core.indexes.accessors import DatetimeIndexProperties
 from pandas.core.indexes.datetimelike import DatetimeTimedeltaMixin
 from pandas.core.series import (
@@ -61,6 +62,11 @@ class DatetimeIndex(
         name: Hashable = ...,
     ) -> Self: ...
     def __reduce__(self): ...
+
+    # Override the array property to return DatetimeArray instead of ExtensionArray
+    @property
+    def array(self) -> DatetimeArray: ...
+
     # various ignores needed for mypy, as we do want to restrict what can be used in
     # arithmetic for these types
     @overload  # type: ignore[override]

tests/indexes/test_indexes.py

@@ -12,6 +12,7 @@
 import numpy as np
 from numpy import typing as npt
 import pandas as pd
+from pandas.core.arrays import DatetimeArray
 from pandas.core.arrays.categorical import Categorical
 from pandas.core.indexes.base import Index
 from typing_extensions import (
@@ -1516,3 +1517,14 @@ def test_period_index_asof_locs() -> None:
         assert_type(idx.asof_locs(where, mask), np_1darray[np.intp]),
         np_1darray[np.intp],
     )
+
+
+def test_datetime_index_array_property() -> None:
+    """Test that DatetimeIndex.array returns DatetimeArray instead of ExtensionArray."""
+    # Test with pd.to_datetime().array - this is the main issue reported
+    arr = pd.to_datetime(["2020-01-01", "2020-01-02"]).array
+    check(assert_type(arr, DatetimeArray), DatetimeArray)
+
+    # Test with DatetimeIndex constructor directly
+    dt_index = pd.DatetimeIndex(["2020-01-01", "2020-01-02"])
+    check(assert_type(dt_index.array, DatetimeArray), DatetimeArray)

tests/series/test_cumul.py

@@ -8,7 +8,7 @@
 )
 
 
-def test_cumul_any_int() -> None:
+def test_cumul_any_float() -> None:
     series = pd.DataFrame({"A": [1.0, float("nan"), 2.0]})["A"]
     check(assert_type(series.cumprod(), pd.Series), pd.Series, np.floating)
 

tests/test_frame.py

@@ -4815,6 +4815,40 @@ def test_from_records() -> None:
         pd.DataFrame,
     )
 
+    # GH1358
+    data, py_l = [[1, 2, 3], [4, 5, 6]], ["a", "b"]
+
+    check(
+        assert_type(pd.DataFrame.from_records(data, pd.Index(py_l)), pd.DataFrame),
+        pd.DataFrame,
+    )
+    check(
+        assert_type(pd.DataFrame.from_records(data, pd.Series(py_l)), pd.DataFrame),
+        pd.DataFrame,
+    )
+    check(
+        assert_type(
+            pd.DataFrame.from_records(data, pd.Series(py_l).array), pd.DataFrame
+        ),
+        pd.DataFrame,
+    )
+    check(
+        assert_type(
+            pd.DataFrame.from_records(data, pd.Series(py_l).values), pd.DataFrame
+        ),
+        pd.DataFrame,
+    )
+    check(
+        assert_type(pd.DataFrame.from_records(data, np.asarray(py_l)), pd.DataFrame),
+        pd.DataFrame,
+    )
+    check(
+        assert_type(
+            pd.DataFrame.from_records(data, np.asarray(py_l, np.str_)), pd.DataFrame
+        ),
+        pd.DataFrame,
+    )
+
 
 def test_frame_index_setter() -> None:
     """Test DataFrame.index setter property GH1366."""