Merge branch 'main' into fix-merge-suffixes-61402

datapythonista · web-flow · commit 12ce6ce4d295 · 2025-06-06T03:22:12.000+04:00
diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json
@@ -42,7 +42,7 @@
     // followed by the pip installed packages).
     "matrix": {
         "pip+build": [],
-        "Cython": ["3.0"],
+        "Cython": [],
         "matplotlib": [],
         "sqlalchemy": [],
         "scipy": [],
diff --git a/ci/deps/actions-310-minimum_versions.yaml b/ci/deps/actions-310-minimum_versions.yaml
@@ -8,7 +8,7 @@ dependencies:
 
   # build dependencies
   - versioneer
-  - cython>=0.29.33
+  - cython<4.0.0a0
   - meson=1.2.1
   - meson-python=0.13.1
 
diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml
@@ -6,7 +6,7 @@ dependencies:
 
   # build dependencies
   - versioneer
-  - cython>=0.29.33
+  - cython<4.0.0a0
   - meson=1.2.1
   - meson-python=0.13.1
 
diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml
@@ -7,7 +7,7 @@ dependencies:
 
   # build dependencies
   - versioneer
-  - cython>=0.29.33
+  - cython<4.0.0a0
   - meson=1.2.1
   - meson-python=0.13.1
 
diff --git a/ci/deps/actions-311-numpydev.yaml b/ci/deps/actions-311-numpydev.yaml
@@ -8,7 +8,7 @@ dependencies:
   - versioneer
   - meson=1.2.1
   - meson-python=0.13.1
-  - cython>=0.29.33
+  - cython<4.0.0a0
 
   # test dependencies
   - pytest>=7.3.2
diff --git a/ci/deps/actions-311-pyarrownightly.yaml b/ci/deps/actions-311-pyarrownightly.yaml
@@ -7,7 +7,7 @@ dependencies:
   # build dependencies
   - versioneer
   - meson=1.2.1
-  - cython>=0.29.33
+  - cython<4.0.0a0
   - meson-python=0.13.1
 
   # test dependencies
diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml
@@ -6,7 +6,7 @@ dependencies:
 
   # build dependencies
   - versioneer
-  - cython>=0.29.33
+  - cython<4.0.0a0
   - meson=1.2.1
   - meson-python=0.13.1
 
diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml
@@ -6,7 +6,7 @@ dependencies:
 
   # build dependencies
   - versioneer
-  - cython>=0.29.33
+  - cython<4.0.0a0
   - meson=1.2.1
   - meson-python=0.13.1
 
diff --git a/ci/deps/actions-313-freethreading.yaml b/ci/deps/actions-313-freethreading.yaml
@@ -7,6 +7,7 @@ dependencies:
   # build dependencies
   - setuptools
   - versioneer
+  - cython<4.0.0a0
   - meson=1.8.0
   - meson-python=0.18.0
 
@@ -21,10 +22,8 @@ dependencies:
   # optional dependencies
   - hypothesis>=6.84.0
 
-  # Move Cython to build dependencies, once they release a version that supports freethreading
   - pip:
     # No free-threaded coveragepy (with the C-extension) on conda-forge yet
     - pytest-cov
     - "tzdata>=2022.7"
     - "--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
-    - "cython"
diff --git a/ci/deps/actions-313.yaml b/ci/deps/actions-313.yaml
@@ -6,7 +6,7 @@ dependencies:
 
   # build dependencies
   - versioneer
-  - cython>=0.29.33
+  - cython<4.0.0a0
   - meson=1.2.1
   - meson-python=0.13.1
 
diff --git a/ci/deps/actions-pypy-39.yaml b/ci/deps/actions-pypy-39.yaml
@@ -9,7 +9,7 @@ dependencies:
 
   # build dependencies
   - versioneer
-  - cython>=0.29.33
+  - cython<4.0.0a0
   - meson=1.2.1
   - meson-python=0.13.1
 
diff --git a/doc/source/whatsnew/v2.3.0.rst b/doc/source/whatsnew/v2.3.0.rst
@@ -1,6 +1,6 @@
 .. _whatsnew_230:
 
-What's new in 2.3.0 (Month XX, 2024)
+What's new in 2.3.0 (June 4, 2025)
 ------------------------------------
 
 These are the changes in pandas 2.3.0. See :ref:`release` for a full changelog
@@ -10,37 +10,26 @@ including other versions of pandas.
 
 .. ---------------------------------------------------------------------------
 
-.. _whatsnew_230.upcoming_changes:
-
-Upcoming changes in pandas 3.0
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
 .. _whatsnew_230.enhancements:
 
 Enhancements
 ~~~~~~~~~~~~
 
-.. _whatsnew_230.enhancements.enhancement1:
-
-enhancement1
-^^^^^^^^^^^^
-
-
 .. _whatsnew_230.enhancements.other:
 
 Other enhancements
 ^^^^^^^^^^^^^^^^^^
 
+- :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`)
 - The semantics for the ``copy`` keyword in ``__array__`` methods (i.e. called
   when using ``np.array()`` or ``np.asarray()`` on pandas objects) has been
   updated to work correctly with NumPy >= 2 (:issue:`57739`)
-- :meth:`Series.str.decode` result now has ``StringDtype`` when ``future.infer_string`` is True (:issue:`60709`)
-- :meth:`~Series.to_hdf` and :meth:`~DataFrame.to_hdf` now round-trip with ``StringDtype``  (:issue:`60663`)
+- :meth:`Series.str.decode` result now has :class:`StringDtype` when ``future.infer_string`` is True (:issue:`60709`)
+- :meth:`~Series.to_hdf` and :meth:`~DataFrame.to_hdf` now round-trip with :class:`StringDtype`  (:issue:`60663`)
 - Improved ``repr`` of :class:`.NumpyExtensionArray` to account for NEP51 (:issue:`61085`)
 - The :meth:`Series.str.decode` has gained the argument ``dtype`` to control the dtype of the result (:issue:`60940`)
-- The :meth:`~Series.cumsum`, :meth:`~Series.cummin`, and :meth:`~Series.cummax` reductions are now implemented for ``StringDtype`` columns (:issue:`60633`)
-- The :meth:`~Series.sum` reduction is now implemented for ``StringDtype`` columns (:issue:`59853`)
+- The :meth:`~Series.cumsum`, :meth:`~Series.cummin`, and :meth:`~Series.cummax` reductions are now implemented for :class:`StringDtype` columns (:issue:`60633`)
+- The :meth:`~Series.sum` reduction is now implemented for :class:`StringDtype` columns (:issue:`59853`)
 
 .. ---------------------------------------------------------------------------
 .. _whatsnew_230.notable_bug_fixes:
@@ -55,7 +44,7 @@ These are bug fixes that might have notable behavior changes.
 Comparisons between different string dtypes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-In previous versions, comparing Series of different string dtypes (e.g. ``pd.StringDtype("pyarrow", na_value=pd.NA)`` against ``pd.StringDtype("python", na_value=np.nan)``) would result in inconsistent resulting dtype or incorrectly raise. pandas will now use the hierarchy
+In previous versions, comparing :class:`Series` of different string dtypes (e.g. ``pd.StringDtype("pyarrow", na_value=pd.NA)`` against ``pd.StringDtype("python", na_value=np.nan)``) would result in inconsistent resulting dtype or incorrectly raise. pandas will now use the hierarchy
 
     object < (python, NaN) < (pyarrow, NaN) < (python, NA) < (pyarrow, NA)
 
@@ -70,9 +59,9 @@ in determining the result dtype when there are different string dtypes compared.
 API changes
 ~~~~~~~~~~~
 
-- When enabling the ``future.infer_string`` option: Index set operations (like
-  union or intersection) will now ignore the dtype of an empty ``RangeIndex`` or
-  empty ``Index`` with object dtype when determining the dtype of the resulting
+- When enabling the ``future.infer_string`` option, :class:`Index` set operations (like
+  union or intersection) will now ignore the dtype of an empty :class:`RangeIndex` or
+  empty :class:`Index` with ``object`` dtype when determining the dtype of the resulting
   Index (:issue:`60797`)
 
 .. ---------------------------------------------------------------------------
@@ -83,121 +72,35 @@ Deprecations
 - Deprecated allowing non-``bool`` values for ``na`` in :meth:`.str.contains`, :meth:`.str.startswith`, and :meth:`.str.endswith` for dtypes that do not already disallow these (:issue:`59615`)
 - Deprecated the ``"pyarrow_numpy"`` storage option for :class:`StringDtype` (:issue:`60152`)
 
-.. ---------------------------------------------------------------------------
-.. _whatsnew_230.performance:
-
-Performance improvements
-~~~~~~~~~~~~~~~~~~~~~~~~
--
--
-
 .. ---------------------------------------------------------------------------
 .. _whatsnew_230.bug_fixes:
 
 Bug fixes
 ~~~~~~~~~
 
-Categorical
-^^^^^^^^^^^
--
--
-
-Datetimelike
-^^^^^^^^^^^^
--
--
-
-Timedelta
-^^^^^^^^^
--
--
-
-Timezones
-^^^^^^^^^
--
--
-
 Numeric
 ^^^^^^^
-- Enabled :class:`Series.mode` and :class:`DataFrame.mode` with ``dropna=False`` to sort the result for all dtypes in the presence of NA values; previously only certain dtypes would sort (:issue:`60702`)
-- Bug in :meth:`Series.round` on object columns no longer raises ``TypeError``
--
-
-Conversion
-^^^^^^^^^^
--
--
+- Bug in :meth:`Series.mode` and :meth:`DataFrame.mode` with ``dropna=False`` where not all dtypes would sort in the presence of ``NA`` values (:issue:`60702`)
+- Bug in :meth:`Series.round` where a ``TypeError`` would always raise with ``object`` dtype (:issue:`61206`)
 
 Strings
 ^^^^^^^
-- Bug in :meth:`.DataFrameGroupBy.min`, :meth:`.DataFrameGroupBy.max`, :meth:`.Resampler.min`, :meth:`.Resampler.max` on string input of all NA values would return float dtype; now returns string (:issue:`60810`)
-- Bug in :meth:`DataFrame.sum` with ``axis=1``, :meth:`.DataFrameGroupBy.sum` or :meth:`.SeriesGroupBy.sum` with ``skipna=True``, and :meth:`.Resampler.sum` on :class:`StringDtype` with all NA values resulted in ``0`` and is now the empty string ``""`` (:issue:`60229`)
-- Bug in :meth:`Series.__pos__` and :meth:`DataFrame.__pos__` did not raise for :class:`StringDtype` with ``storage="pyarrow"`` (:issue:`60710`)
-- Bug in :meth:`Series.rank` for :class:`StringDtype` with ``storage="pyarrow"`` incorrectly returning integer results in case of ``method="average"`` and raising an error if it would truncate results (:issue:`59768`)
+- Bug in :meth:`.DataFrameGroupBy.min`, :meth:`.DataFrameGroupBy.max`, :meth:`.Resampler.min`, :meth:`.Resampler.max` where all NA values of string dtype would return float instead of string dtype (:issue:`60810`)
+- Bug in :meth:`DataFrame.sum` with ``axis=1``, :meth:`.DataFrameGroupBy.sum` or :meth:`.SeriesGroupBy.sum` with ``skipna=True``, and :meth:`.Resampler.sum` with all NA values of :class:`StringDtype` resulted in ``0`` instead of the empty string ``""`` (:issue:`60229`)
+- Bug in :meth:`Series.__pos__` and :meth:`DataFrame.__pos__` where an ``Exception`` was not raised for :class:`StringDtype` with ``storage="pyarrow"`` (:issue:`60710`)
+- Bug in :meth:`Series.rank` for :class:`StringDtype` with ``storage="pyarrow"`` that incorrectly returned integer results with ``method="average"`` and raised an error if it would truncate results (:issue:`59768`)
 - Bug in :meth:`Series.replace` with :class:`StringDtype` when replacing with a non-string value was not upcasting to ``object`` dtype (:issue:`60282`)
+- Bug in :meth:`Series.str.center` with :class:`StringDtype` with ``storage="pyarrow"`` not matching the python behavior in corner cases with an odd number of fill characters (:issue:`54792`)
 - Bug in :meth:`Series.str.replace` when ``n < 0`` for :class:`StringDtype` with ``storage="pyarrow"`` (:issue:`59628`)
-- Bug in ``ser.str.slice`` with negative ``step`` with :class:`ArrowDtype` and :class:`StringDtype` with ``storage="pyarrow"`` giving incorrect results (:issue:`59710`)
-- Bug in the ``center`` method on :class:`Series` and :class:`Index` object ``str`` accessors with pyarrow-backed dtype not matching the python behavior in corner cases with an odd number of fill characters (:issue:`54792`)
-
-Interval
-^^^^^^^^
--
--
+- Bug in :meth:`Series.str.slice` with negative ``step`` with :class:`ArrowDtype` and :class:`StringDtype` with ``storage="pyarrow"`` giving incorrect results (:issue:`59710`)
 
 Indexing
 ^^^^^^^^
-- Fixed bug in :meth:`Index.get_indexer` round-tripping through string dtype when ``infer_string`` is enabled (:issue:`55834`)
--
-
-Missing
-^^^^^^^
--
--
-
-MultiIndex
-^^^^^^^^^^
--
--
+- Bug in :meth:`Index.get_indexer` round-tripping through string dtype when ``infer_string`` is enabled (:issue:`55834`)
 
 I/O
 ^^^
-- :meth:`DataFrame.to_excel` was storing decimals as strings instead of numbers (:issue:`49598`)
--
-
-Period
-^^^^^^
--
--
-
-Plotting
-^^^^^^^^
--
--
-
-Groupby/resample/rolling
-^^^^^^^^^^^^^^^^^^^^^^^^
--
--
-
-Reshaping
-^^^^^^^^^
--
--
-
-Sparse
-^^^^^^
--
--
-
-ExtensionArray
-^^^^^^^^^^^^^^
--
--
-
-Styler
-^^^^^^
--
--
+- Bug in :meth:`DataFrame.to_excel` which stored decimals as strings instead of numbers (:issue:`49598`)
 
 Other
 ^^^^^
@@ -209,3 +112,5 @@ Other
 
 Contributors
 ~~~~~~~~~~~~
+
+.. contributors:: v2.2.3..v2.3.0|HEAD
diff --git a/doc/source/whatsnew/v3.0.0.rst b/doc/source/whatsnew/v3.0.0.rst
@@ -30,7 +30,6 @@ Other enhancements
 ^^^^^^^^^^^^^^^^^^
 - :class:`pandas.api.typing.FrozenList` is available for typing the outputs of :attr:`MultiIndex.names`, :attr:`MultiIndex.codes` and :attr:`MultiIndex.levels` (:issue:`58237`)
 - :class:`pandas.api.typing.SASReader` is available for typing the output of :func:`read_sas` (:issue:`55689`)
-- :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`)
 - Added :meth:`.Styler.to_typst` to write Styler objects to file, buffer or string in Typst format (:issue:`57617`)
 - Added missing :meth:`pandas.Series.info` to API reference (:issue:`60926`)
 - :class:`pandas.api.typing.NoDefault` is available for typing ``no_default``
diff --git a/environment.yml b/environment.yml
@@ -8,7 +8,7 @@ dependencies:
 
   # build dependencies
   - versioneer
-  - cython~=3.0.5
+  - cython<4.0.0a0
   - meson=1.2.1
   - meson-python=0.13.1
 
diff --git a/pandas/tests/groupby/test_raises.py b/pandas/tests/groupby/test_raises.py
@@ -671,7 +671,7 @@ def test_groupby_raises_category_on_category(
         "nunique": (None, ""),
         "pct_change": (TypeError, "unsupported operand type"),
         "prod": (TypeError, "category type does not support prod operations"),
-        "quantile": (TypeError, ""),
+        "quantile": (TypeError, "No matching signature found"),
         "rank": (None, ""),
         "sem": (
             TypeError,
diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ requires = [
     "meson-python>=0.13.1",
     "meson>=1.2.1,<2",
     "wheel",
-    "Cython==3.1.0rc1",  # Note: sync with setup.py, environment.yml and asv.conf.json
+    "Cython<4.0.0a0",  # Note: sync with setup.py, environment.yml and asv.conf.json
     # Force numpy higher than 2.0rc1, so that built wheels are compatible
     # with both numpy 1 and 2
     "numpy>=2.0.0rc1",
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -3,7 +3,7 @@
 
 pip
 versioneer[toml]
-cython~=3.0.5
+cython<4.0.0a0
 meson[ninja]==1.2.1
 meson-python==0.13.1
 pytest>=7.3.2
diff --git a/web/pandas/versions.json b/web/pandas/versions.json
@@ -5,11 +5,16 @@
         "url": "https://pandas.pydata.org/docs/dev/"
     },
     {
-        "name": "2.2 (stable)",
-        "version": "2.2",
+        "name": "2.3 (stable)",
+        "version": "2.3",
         "url": "https://pandas.pydata.org/docs/",
         "preferred": true
     },
+    {
+        "name": "2.2",
+        "version": "2.2",
+        "url": "https://pandas.pydata.org/pandas-docs/version/2.2/"
+    },
     {
         "name": "2.1",
         "version": "2.1",
