Skip to content

Commit 2902e07

Browse files
committed
Merge branch 'main' into fix-idx-comp
2 parents 509c74c + cb8ac5e commit 2902e07

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

doc/source/whatsnew/v2.3.0.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ enhancement1
3232
Other enhancements
3333
^^^^^^^^^^^^^^^^^^
3434

35+
- :meth:`pandas.api.interchange.from_dataframe` now uses the `PyCapsule Interface <https://arrow.apache.org/docs/format/CDataInterface/PyCapsuleInterface.html>`_ if available, only falling back to the Dataframe Interchange Protocol if that fails (:issue:`60739`)
3536
- The semantics for the ``copy`` keyword in ``__array__`` methods (i.e. called
3637
when using ``np.array()`` or ``np.asarray()`` on pandas objects) has been
3738
updated to work correctly with NumPy >= 2 (:issue:`57739`)

doc/source/whatsnew/v3.0.0.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ Other enhancements
3030
^^^^^^^^^^^^^^^^^^
3131
- :class:`pandas.api.typing.FrozenList` is available for typing the outputs of :attr:`MultiIndex.names`, :attr:`MultiIndex.codes` and :attr:`MultiIndex.levels` (:issue:`58237`)
3232
- :class:`pandas.api.typing.SASReader` is available for typing the output of :func:`read_sas` (:issue:`55689`)
33-
- :meth:`pandas.api.interchange.from_dataframe` now uses the `PyCapsule Interface <https://arrow.apache.org/docs/format/CDataInterface/PyCapsuleInterface.html>`_ if available, only falling back to the Dataframe Interchange Protocol if that fails (:issue:`60739`)
3433
- Added :meth:`.Styler.to_typst` to write Styler objects to file, buffer or string in Typst format (:issue:`57617`)
3534
- Added missing :meth:`pandas.Series.info` to API reference (:issue:`60926`)
3635
- :class:`pandas.api.typing.NoDefault` is available for typing ``no_default``

pandas/tests/groupby/test_raises.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ def test_groupby_raises_category_on_category(
671671
"nunique": (None, ""),
672672
"pct_change": (TypeError, "unsupported operand type"),
673673
"prod": (TypeError, "category type does not support prod operations"),
674-
"quantile": (TypeError, ""),
674+
"quantile": (TypeError, "No matching signature found"),
675675
"rank": (None, ""),
676676
"sem": (
677677
TypeError,

0 commit comments

Comments
 (0)