Skip to content

Commit e64b79b

Browse files
jbrockmendeljbrockmendel
committed
Merge branch 'main' into ref-dtype-explicit
2 parents 71c147c + 2419343 commit e64b79b

Some content is hidden

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

50 files changed

+592
-308
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/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 & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,8 @@ 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.PeriodDtype.freq SA01" \
7775
-i "pandas.RangeIndex.from_range PR01,SA01" \
7876
-i "pandas.RangeIndex.step SA01" \
7977
-i "pandas.Series.cat.add_categories PR01,PR02" \
@@ -103,12 +101,10 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
103101
-i "pandas.Series.sparse.from_coo PR07,SA01" \
104102
-i "pandas.Series.sparse.npoints SA01" \
105103
-i "pandas.Series.sparse.sp_values SA01" \
106-
-i "pandas.Timedelta.components SA01" \
107104
-i "pandas.Timedelta.max PR02" \
108105
-i "pandas.Timedelta.min PR02" \
109106
-i "pandas.Timedelta.resolution PR02" \
110107
-i "pandas.Timedelta.to_timedelta64 SA01" \
111-
-i "pandas.Timedelta.total_seconds SA01" \
112108
-i "pandas.TimedeltaIndex.to_pytimedelta RT03,SA01" \
113109
-i "pandas.Timestamp.max PR02" \
114110
-i "pandas.Timestamp.min PR02" \
@@ -117,14 +113,12 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
117113
-i "pandas.Timestamp.tzinfo GL08" \
118114
-i "pandas.Timestamp.year GL08" \
119115
-i "pandas.api.types.is_dict_like PR07,SA01" \
120-
-i "pandas.api.types.is_extension_array_dtype SA01" \
121116
-i "pandas.api.types.is_file_like PR07,SA01" \
122117
-i "pandas.api.types.is_float PR01,SA01" \
123118
-i "pandas.api.types.is_float_dtype SA01" \
124119
-i "pandas.api.types.is_hashable PR01,RT03,SA01" \
125120
-i "pandas.api.types.is_int64_dtype SA01" \
126121
-i "pandas.api.types.is_integer PR01,SA01" \
127-
-i "pandas.api.types.is_integer_dtype SA01" \
128122
-i "pandas.api.types.is_interval_dtype SA01" \
129123
-i "pandas.api.types.is_iterator PR07,SA01" \
130124
-i "pandas.api.types.is_list_like SA01" \
@@ -136,7 +130,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
136130
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
137131
-i "pandas.arrays.BooleanArray SA01" \
138132
-i "pandas.arrays.DatetimeArray SA01" \
139-
-i "pandas.arrays.FloatingArray SA01" \
140133
-i "pandas.arrays.IntegerArray SA01" \
141134
-i "pandas.arrays.IntervalArray.left SA01" \
142135
-i "pandas.arrays.IntervalArray.length SA01" \
@@ -153,14 +146,11 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
153146
-i "pandas.core.groupby.DataFrameGroupBy.groups SA01" \
154147
-i "pandas.core.groupby.DataFrameGroupBy.hist RT03" \
155148
-i "pandas.core.groupby.DataFrameGroupBy.indices SA01" \
156-
-i "pandas.core.groupby.DataFrameGroupBy.max SA01" \
157-
-i "pandas.core.groupby.DataFrameGroupBy.min SA01" \
158149
-i "pandas.core.groupby.DataFrameGroupBy.nth PR02" \
159150
-i "pandas.core.groupby.DataFrameGroupBy.nunique SA01" \
160151
-i "pandas.core.groupby.DataFrameGroupBy.ohlc SA01" \
161152
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
162153
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
163-
-i "pandas.core.groupby.DataFrameGroupBy.sum SA01" \
164154
-i "pandas.core.groupby.SeriesGroupBy.__iter__ RT03,SA01" \
165155
-i "pandas.core.groupby.SeriesGroupBy.agg RT03" \
166156
-i "pandas.core.groupby.SeriesGroupBy.aggregate RT03" \
@@ -169,13 +159,10 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
169159
-i "pandas.core.groupby.SeriesGroupBy.indices SA01" \
170160
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_decreasing SA01" \
171161
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_increasing SA01" \
172-
-i "pandas.core.groupby.SeriesGroupBy.max SA01" \
173-
-i "pandas.core.groupby.SeriesGroupBy.min SA01" \
174162
-i "pandas.core.groupby.SeriesGroupBy.nth PR02" \
175163
-i "pandas.core.groupby.SeriesGroupBy.ohlc SA01" \
176164
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
177165
-i "pandas.core.groupby.SeriesGroupBy.sem SA01" \
178-
-i "pandas.core.groupby.SeriesGroupBy.sum SA01" \
179166
-i "pandas.core.resample.Resampler.__iter__ RT03,SA01" \
180167
-i "pandas.core.resample.Resampler.ffill RT03" \
181168
-i "pandas.core.resample.Resampler.get_group RT03,SA01" \
@@ -204,7 +191,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
204191
-i "pandas.errors.IntCastingNaNError SA01" \
205192
-i "pandas.errors.InvalidIndexError SA01" \
206193
-i "pandas.errors.InvalidVersion SA01" \
207-
-i "pandas.errors.MergeError SA01" \
208194
-i "pandas.errors.NullFrequencyError SA01" \
209195
-i "pandas.errors.NumExprClobberingError SA01" \
210196
-i "pandas.errors.NumbaUtilError SA01" \
@@ -397,7 +383,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
397383
-i "pandas.tseries.offsets.Week.n GL08" \
398384
-i "pandas.tseries.offsets.Week.normalize GL08" \
399385
-i "pandas.tseries.offsets.Week.weekday GL08" \
400-
-i "pandas.tseries.offsets.WeekOfMonth SA01" \
401386
-i "pandas.tseries.offsets.WeekOfMonth.is_on_offset GL08" \
402387
-i "pandas.tseries.offsets.WeekOfMonth.n GL08" \
403388
-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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ 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`)
106107
- Bug in ``ser.str.slice`` with negative ``step`` with :class:`ArrowDtype` and :class:`StringDtype` with ``storage="pyarrow"`` giving incorrect results (:issue:`59710`)
107108
- 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`)

‎doc/source/whatsnew/v3.0.0.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,7 @@ I/O
627627
- Bug in :meth:`read_csv` causing segmentation fault when ``encoding_errors`` is not a string. (:issue:`59059`)
628628
- Bug in :meth:`read_csv` raising ``TypeError`` when ``index_col`` is specified and ``na_values`` is a dict containing the key ``None``. (:issue:`57547`)
629629
- Bug in :meth:`read_csv` raising ``TypeError`` when ``nrows`` and ``iterator`` are specified without specifying a ``chunksize``. (:issue:`59079`)
630+
- Bug in :meth:`read_csv` where the order of the ``na_values`` makes an inconsistency when ``na_values`` is a list non-string values. (:issue:`59303`)
630631
- Bug in :meth:`read_excel` raising ``ValueError`` when passing array of boolean values when ``dtype="boolean"``. (:issue:`58159`)
631632
- Bug in :meth:`read_json` not validating the ``typ`` argument to not be exactly ``"frame"`` or ``"series"`` (:issue:`59124`)
632633
- Bug in :meth:`read_stata` raising ``KeyError`` when input file is stored in big-endian format and contains strL data. (:issue:`58638`)
@@ -692,7 +693,6 @@ Other
692693
^^^^^
693694
- Bug in :class:`DataFrame` when passing a ``dict`` with a NA scalar and ``columns`` that would always return ``np.nan`` (:issue:`57205`)
694695
- Bug in :func:`eval` on :class:`ExtensionArray` on including division ``/`` failed with a ``TypeError``. (:issue:`58748`)
695-
- Bug in :func:`eval` on :class:`complex` including division ``/`` discards imaginary part. (:issue:`21374`)
696696
- Bug in :func:`eval` where the names of the :class:`Series` were not preserved when using ``engine="numexpr"``. (:issue:`10239`)
697697
- Bug in :func:`unique` on :class:`Index` not always returning :class:`Index` (:issue:`57043`)
698698
- Bug in :meth:`DataFrame.apply` where passing ``engine="numba"`` ignored ``args`` passed to the applied function (:issue:`58712`)

0 commit comments

Comments
 (0)