Skip to content

Commit 697c6fe

Browse files
wooseogchoiwooseogchoi
committed
Merge branch 'main' of https://github.com/pandas-dev/pandas into issue_#59009
2 parents 7fdbf43 + 71b395f commit 697c6fe

File tree

127 files changed

+2067
-1173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+2067
-1173
lines changed

‎.circleci/config.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,13 @@ jobs:
9292
no_output_timeout: 30m # Sometimes the tests won't generate any output, make sure the job doesn't get killed by that
9393
command: |
9494
pip3 install cibuildwheel==2.20.0
95-
cibuildwheel --output-dir wheelhouse
95+
if [[ $CIBW_BUILD == cp313t* ]]; then
96+
# TODO: temporarily run 3.13 free threaded builds without build isolation
97+
# since we need pre-release cython
98+
CIBW_BUILD_FRONTEND="pip; args: --no-build-isolation" cibuildwheel --output-dir wheelhouse
99+
else
100+
cibuildwheel --output-dir wheelhouse
101+
fi
96102
97103
environment:
98104
CIBW_BUILD: << parameters.cibw-build >>
@@ -141,6 +147,10 @@ workflows:
141147
cibw-build: ["cp310-manylinux_aarch64",
142148
"cp311-manylinux_aarch64",
143149
"cp312-manylinux_aarch64",
150+
"cp313-manylinux_aarch64",
151+
"cp313t-manylinux_aarch64",
144152
"cp310-musllinux_aarch64",
145153
"cp311-musllinux_aarch64",
146-
"cp312-musllinux_aarch64",]
154+
"cp312-musllinux_aarch64",
155+
"cp313-musllinux_aarch64",
156+
"cp313t-musllinux_aarch64"]

‎.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ jobs:
380380
fetch-depth: 0
381381

382382
- name: Set up Python Free-threading Version
383-
uses: deadsnakes/action@v3.1.0
383+
uses: deadsnakes/action@v3.2.0
384384
with:
385385
python-version: 3.13-dev
386386
nogil: true

‎.github/workflows/wheels.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ jobs:
102102
python: [["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"], ["cp313", "3.13"], ["cp313t", "3.13"]]
103103
include:
104104
# TODO: Remove this plus installing build deps in cibw_before_build.sh
105-
# and test deps in cibw_before_test.sh after pandas can be built with a released NumPy/Cython
106-
- python: ["cp313", "3.13"]
107-
cibw_build_frontend: 'pip; args: --no-build-isolation'
105+
# after pandas can be built with a released NumPy/Cython
108106
- python: ["cp313t", "3.13"]
109107
cibw_build_frontend: 'pip; args: --no-build-isolation'
110108
# Build Pyodide wheels and upload them to Anaconda.org
@@ -187,11 +185,9 @@ jobs:
187185
- name: Test Windows Wheels
188186
if: ${{ matrix.buildplat[1] == 'win_amd64' }}
189187
shell: pwsh
190-
# TODO: Remove NumPy nightly install when there's a 3.13 wheel on PyPI
191188
run: |
192189
$TST_CMD = @"
193190
python -m pip install hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0;
194-
${{ matrix.python[1] == '3.13' && 'python -m pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy;' }}
195191
python -m pip install `$(Get-Item pandas\wheelhouse\*.whl);
196192
python -c `'import pandas as pd; pd.test(extra_args=[`\"--no-strict-data-files`\", `\"-m not clipboard and not single_cpu and not slow and not network and not db`\"])`';
197193
"@

‎MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,3 @@ graft pandas/_libs/include
6565

6666
# Include cibw script in sdist since it's needed for building wheels
6767
include scripts/cibw_before_build.sh
68-
include scripts/cibw_before_test.sh

‎ci/code_checks.sh

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,10 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
7070
--format=actions \
7171
-i ES01 `# For now it is ok if docstrings are missing the extended summary` \
7272
-i "pandas.Series.dt PR01" `# Accessors are implemented as classes, but we do not document the Parameters section` \
73-
-i "pandas.NA SA01" \
7473
-i "pandas.Period.freq GL08" \
7574
-i "pandas.Period.ordinal GL08" \
76-
-i "pandas.Period.to_timestamp SA01" \
77-
-i "pandas.PeriodDtype.freq SA01" \
7875
-i "pandas.RangeIndex.from_range PR01,SA01" \
79-
-i "pandas.RangeIndex.start SA01" \
8076
-i "pandas.RangeIndex.step SA01" \
81-
-i "pandas.RangeIndex.stop SA01" \
8277
-i "pandas.Series.cat.add_categories PR01,PR02" \
8378
-i "pandas.Series.cat.as_ordered PR01" \
8479
-i "pandas.Series.cat.as_unordered PR01" \
@@ -92,12 +87,9 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
9287
-i "pandas.Series.dt.day_name PR01,PR02" \
9388
-i "pandas.Series.dt.floor PR01,PR02" \
9489
-i "pandas.Series.dt.freq GL08" \
95-
-i "pandas.Series.dt.microseconds SA01" \
9690
-i "pandas.Series.dt.month_name PR01,PR02" \
97-
-i "pandas.Series.dt.nanoseconds SA01" \
9891
-i "pandas.Series.dt.normalize PR01" \
9992
-i "pandas.Series.dt.round PR01,PR02" \
100-
-i "pandas.Series.dt.seconds SA01" \
10193
-i "pandas.Series.dt.strftime PR01,PR02" \
10294
-i "pandas.Series.dt.to_period PR01,PR02" \
10395
-i "pandas.Series.dt.total_seconds PR01" \
@@ -109,48 +101,24 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
109101
-i "pandas.Series.sparse.from_coo PR07,SA01" \
110102
-i "pandas.Series.sparse.npoints SA01" \
111103
-i "pandas.Series.sparse.sp_values SA01" \
112-
-i "pandas.Timedelta.asm8 SA01" \
113-
-i "pandas.Timedelta.ceil SA01" \
114-
-i "pandas.Timedelta.components SA01" \
115-
-i "pandas.Timedelta.floor SA01" \
116104
-i "pandas.Timedelta.max PR02" \
117105
-i "pandas.Timedelta.min PR02" \
118106
-i "pandas.Timedelta.resolution PR02" \
119-
-i "pandas.Timedelta.round SA01" \
120-
-i "pandas.Timedelta.to_numpy PR01" \
121107
-i "pandas.Timedelta.to_timedelta64 SA01" \
122-
-i "pandas.Timedelta.total_seconds SA01" \
123-
-i "pandas.Timedelta.view SA01" \
124-
-i "pandas.TimedeltaIndex.components SA01" \
125-
-i "pandas.TimedeltaIndex.microseconds SA01" \
126-
-i "pandas.TimedeltaIndex.nanoseconds SA01" \
127-
-i "pandas.TimedeltaIndex.seconds SA01" \
128108
-i "pandas.TimedeltaIndex.to_pytimedelta RT03,SA01" \
129109
-i "pandas.Timestamp.max PR02" \
130110
-i "pandas.Timestamp.min PR02" \
131111
-i "pandas.Timestamp.nanosecond GL08" \
132112
-i "pandas.Timestamp.resolution PR02" \
133113
-i "pandas.Timestamp.tzinfo GL08" \
134-
-i "pandas.Timestamp.value GL08" \
135114
-i "pandas.Timestamp.year GL08" \
136-
-i "pandas.api.extensions.ExtensionArray.interpolate PR01,SA01" \
137-
-i "pandas.api.interchange.from_dataframe RT03,SA01" \
138-
-i "pandas.api.types.is_bool PR01,SA01" \
139-
-i "pandas.api.types.is_categorical_dtype SA01" \
140-
-i "pandas.api.types.is_complex PR01,SA01" \
141-
-i "pandas.api.types.is_complex_dtype SA01" \
142-
-i "pandas.api.types.is_datetime64_dtype SA01" \
143-
-i "pandas.api.types.is_datetime64_ns_dtype SA01" \
144-
-i "pandas.api.types.is_datetime64tz_dtype SA01" \
145115
-i "pandas.api.types.is_dict_like PR07,SA01" \
146-
-i "pandas.api.types.is_extension_array_dtype SA01" \
147116
-i "pandas.api.types.is_file_like PR07,SA01" \
148117
-i "pandas.api.types.is_float PR01,SA01" \
149118
-i "pandas.api.types.is_float_dtype SA01" \
150119
-i "pandas.api.types.is_hashable PR01,RT03,SA01" \
151120
-i "pandas.api.types.is_int64_dtype SA01" \
152121
-i "pandas.api.types.is_integer PR01,SA01" \
153-
-i "pandas.api.types.is_integer_dtype SA01" \
154122
-i "pandas.api.types.is_interval_dtype SA01" \
155123
-i "pandas.api.types.is_iterator PR07,SA01" \
156124
-i "pandas.api.types.is_list_like SA01" \
@@ -162,7 +130,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
162130
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
163131
-i "pandas.arrays.BooleanArray SA01" \
164132
-i "pandas.arrays.DatetimeArray SA01" \
165-
-i "pandas.arrays.FloatingArray SA01" \
166133
-i "pandas.arrays.IntegerArray SA01" \
167134
-i "pandas.arrays.IntervalArray.left SA01" \
168135
-i "pandas.arrays.IntervalArray.length SA01" \
@@ -175,35 +142,26 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
175142
-i "pandas.core.groupby.DataFrameGroupBy.agg RT03" \
176143
-i "pandas.core.groupby.DataFrameGroupBy.aggregate RT03" \
177144
-i "pandas.core.groupby.DataFrameGroupBy.boxplot PR07,RT03,SA01" \
178-
-i "pandas.core.groupby.DataFrameGroupBy.filter SA01" \
179145
-i "pandas.core.groupby.DataFrameGroupBy.get_group RT03,SA01" \
180146
-i "pandas.core.groupby.DataFrameGroupBy.groups SA01" \
181-
-i "pandas.core.groupby.DataFrameGroupBy.hist RT03" \
182147
-i "pandas.core.groupby.DataFrameGroupBy.indices SA01" \
183-
-i "pandas.core.groupby.DataFrameGroupBy.max SA01" \
184-
-i "pandas.core.groupby.DataFrameGroupBy.min SA01" \
185148
-i "pandas.core.groupby.DataFrameGroupBy.nth PR02" \
186149
-i "pandas.core.groupby.DataFrameGroupBy.nunique SA01" \
187150
-i "pandas.core.groupby.DataFrameGroupBy.ohlc SA01" \
188151
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
189152
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
190-
-i "pandas.core.groupby.DataFrameGroupBy.sum SA01" \
191153
-i "pandas.core.groupby.SeriesGroupBy.__iter__ RT03,SA01" \
192154
-i "pandas.core.groupby.SeriesGroupBy.agg RT03" \
193155
-i "pandas.core.groupby.SeriesGroupBy.aggregate RT03" \
194-
-i "pandas.core.groupby.SeriesGroupBy.filter PR01,SA01" \
195156
-i "pandas.core.groupby.SeriesGroupBy.get_group RT03,SA01" \
196157
-i "pandas.core.groupby.SeriesGroupBy.groups SA01" \
197158
-i "pandas.core.groupby.SeriesGroupBy.indices SA01" \
198159
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_decreasing SA01" \
199160
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_increasing SA01" \
200-
-i "pandas.core.groupby.SeriesGroupBy.max SA01" \
201-
-i "pandas.core.groupby.SeriesGroupBy.min SA01" \
202161
-i "pandas.core.groupby.SeriesGroupBy.nth PR02" \
203162
-i "pandas.core.groupby.SeriesGroupBy.ohlc SA01" \
204163
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
205164
-i "pandas.core.groupby.SeriesGroupBy.sem SA01" \
206-
-i "pandas.core.groupby.SeriesGroupBy.sum SA01" \
207165
-i "pandas.core.resample.Resampler.__iter__ RT03,SA01" \
208166
-i "pandas.core.resample.Resampler.ffill RT03" \
209167
-i "pandas.core.resample.Resampler.get_group RT03,SA01" \
@@ -232,7 +190,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
232190
-i "pandas.errors.IntCastingNaNError SA01" \
233191
-i "pandas.errors.InvalidIndexError SA01" \
234192
-i "pandas.errors.InvalidVersion SA01" \
235-
-i "pandas.errors.MergeError SA01" \
236193
-i "pandas.errors.NullFrequencyError SA01" \
237194
-i "pandas.errors.NumExprClobberingError SA01" \
238195
-i "pandas.errors.NumbaUtilError SA01" \
@@ -425,7 +382,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
425382
-i "pandas.tseries.offsets.Week.n GL08" \
426383
-i "pandas.tseries.offsets.Week.normalize GL08" \
427384
-i "pandas.tseries.offsets.Week.weekday GL08" \
428-
-i "pandas.tseries.offsets.WeekOfMonth SA01" \
429385
-i "pandas.tseries.offsets.WeekOfMonth.is_on_offset GL08" \
430386
-i "pandas.tseries.offsets.WeekOfMonth.n GL08" \
431387
-i "pandas.tseries.offsets.WeekOfMonth.normalize GL08" \

‎doc/source/conf.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,9 @@
254254
"json_url": "https://pandas.pydata.org/versions.json",
255255
"version_match": switcher_version,
256256
},
257-
"show_version_warning_banner": True,
257+
# This shows a warning for patch releases since the
258+
# patch version doesn't compare as equal (e.g. 2.2.1 != 2.2.0 but it should be)
259+
"show_version_warning_banner": False,
258260
"icon_links": [
259261
{
260262
"name": "Mastodon",

‎doc/source/whatsnew/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Version 2.2
3232
.. toctree::
3333
:maxdepth: 2
3434

35+
v2.2.3
3536
v2.2.2
3637
v2.2.1
3738
v2.2.0

‎doc/source/whatsnew/v2.2.2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ Other
5656
Contributors
5757
~~~~~~~~~~~~
5858

59-
.. contributors:: v2.2.1..v2.2.2|HEAD
59+
.. contributors:: v2.2.1..v2.2.2

‎doc/source/whatsnew/v2.2.3.rst

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
.. _whatsnew_223:
2+
3+
What's new in 2.2.3 (September 20, 2024)
4+
----------------------------------------
5+
6+
These are the changes in pandas 2.2.3. See :ref:`release` for a full changelog
7+
including other versions of pandas.
8+
9+
{{ header }}
10+
11+
.. ---------------------------------------------------------------------------
12+
13+
.. _whatsnew_220.py13_compat:
14+
15+
Pandas 2.2.3 is now compatible with Python 3.13
16+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17+
18+
Pandas 2.2.3 is the first version of pandas that is generally compatible with the upcoming
19+
Python 3.13, and both wheels for free-threaded and normal Python 3.13 will be uploaded for
20+
this release.
21+
22+
As usual please report any bugs discovered to our `issue tracker <https://github.com/pandas-dev/pandas/issues/new/choose>`_
23+
24+
.. ---------------------------------------------------------------------------
25+
.. _whatsnew_223.bug_fixes:
26+
27+
Bug fixes
28+
~~~~~~~~~
29+
- Bug in :func:`eval` on :class:`complex` including division ``/`` discards imaginary part. (:issue:`21374`)
30+
- Minor fixes for numpy 2.1 compatibility. (:issue:`59444`)
31+
32+
.. ---------------------------------------------------------------------------
33+
.. _whatsnew_223.other:
34+
35+
Other
36+
~~~~~
37+
- Missing licenses for 3rd party dependencies were added back into the wheels. (:issue:`58632`)
38+
39+
.. ---------------------------------------------------------------------------
40+
.. _whatsnew_223.contributors:
41+
42+
Contributors
43+
~~~~~~~~~~~~
44+
45+
.. contributors:: v2.2.2..v2.2.3|HEAD

‎doc/source/whatsnew/v2.3.0.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,11 @@ Conversion
102102

103103
Strings
104104
^^^^^^^
105+
- 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`)
105106
- Bug in :meth:`Series.str.replace` when ``n < 0`` for :class:`StringDtype` with ``storage="pyarrow"`` (:issue:`59628`)
107+
- Bug in ``ser.str.slice`` with negative ``step`` with :class:`ArrowDtype` and :class:`StringDtype` with ``storage="pyarrow"`` giving incorrect results (:issue:`59710`)
106108
- 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`)
107-
109+
-
108110

109111
Interval
110112
^^^^^^^^

0 commit comments

Comments
 (0)