Skip to content

Commit d7766d7

Browse files
rhshadrachrhshadrach
authored
Merge branch 'main' into groupby_value_counts_sort
2 parents ede98f7 + 05fa958 commit d7766d7

File tree

195 files changed

+2650
-1447
lines changed

Some content is hidden

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

195 files changed

+2650
-1447
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/actions/setup-conda/action.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ runs:
99
- name: Install ${{ inputs.environment-file }}
1010
uses: mamba-org/setup-micromamba@v1
1111
with:
12+
# Pinning to avoid 2.0 failures
13+
micromamba-version: '1.5.10-0'
1214
environment-file: ${{ inputs.environment-file }}
1315
environment-name: test
1416
condarc-file: ci/.condarc

‎.github/workflows/code-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.2.x
11+
- 2.3.x
1212

1313
env:
1414
ENV_FILE: environment.yml

‎.github/workflows/docbuild-and-upload.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
tags:
99
- '*'
1010
pull_request:
1111
branches:
1212
- main
13-
- 2.2.x
13+
- 2.3.x
1414

1515
env:
1616
ENV_FILE: environment.yml

‎.github/workflows/package-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.2.x
11+
- 2.3.x
1212
types: [ labeled, opened, synchronize, reopened ]
1313

1414
permissions:

‎.github/workflows/unit-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.2.x
11+
- 2.3.x
1212
paths-ignore:
1313
- "doc/**"
1414
- "web/**"
@@ -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 & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,9 @@ 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" \
78-
-i "pandas.RangeIndex.start SA01" \
79-
-i "pandas.RangeIndex.step SA01" \
80-
-i "pandas.RangeIndex.stop SA01" \
8176
-i "pandas.Series.cat.add_categories PR01,PR02" \
8277
-i "pandas.Series.cat.as_ordered PR01" \
8378
-i "pandas.Series.cat.as_unordered PR01" \
@@ -92,108 +87,60 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
9287
-i "pandas.Series.dt.floor PR01,PR02" \
9388
-i "pandas.Series.dt.freq GL08" \
9489
-i "pandas.Series.dt.month_name PR01,PR02" \
95-
-i "pandas.Series.dt.nanoseconds SA01" \
9690
-i "pandas.Series.dt.normalize PR01" \
9791
-i "pandas.Series.dt.round PR01,PR02" \
98-
-i "pandas.Series.dt.seconds SA01" \
9992
-i "pandas.Series.dt.strftime PR01,PR02" \
10093
-i "pandas.Series.dt.to_period PR01,PR02" \
10194
-i "pandas.Series.dt.total_seconds PR01" \
10295
-i "pandas.Series.dt.tz_convert PR01,PR02" \
10396
-i "pandas.Series.dt.tz_localize PR01,PR02" \
10497
-i "pandas.Series.dt.unit GL08" \
10598
-i "pandas.Series.pad PR01,SA01" \
106-
-i "pandas.Series.sparse.fill_value SA01" \
10799
-i "pandas.Series.sparse.from_coo PR07,SA01" \
108-
-i "pandas.Series.sparse.npoints SA01" \
109-
-i "pandas.Series.sparse.sp_values SA01" \
110-
-i "pandas.Timedelta.components SA01" \
111100
-i "pandas.Timedelta.max PR02" \
112101
-i "pandas.Timedelta.min PR02" \
113102
-i "pandas.Timedelta.resolution PR02" \
114-
-i "pandas.Timedelta.to_timedelta64 SA01" \
115-
-i "pandas.Timedelta.total_seconds SA01" \
116-
-i "pandas.TimedeltaIndex.nanoseconds SA01" \
117-
-i "pandas.TimedeltaIndex.seconds SA01" \
118-
-i "pandas.TimedeltaIndex.to_pytimedelta RT03,SA01" \
119103
-i "pandas.Timestamp.max PR02" \
120104
-i "pandas.Timestamp.min PR02" \
121105
-i "pandas.Timestamp.nanosecond GL08" \
122106
-i "pandas.Timestamp.resolution PR02" \
123107
-i "pandas.Timestamp.tzinfo GL08" \
124108
-i "pandas.Timestamp.year GL08" \
125-
-i "pandas.api.extensions.ExtensionArray.interpolate PR01,SA01" \
126-
-i "pandas.api.types.is_bool PR01,SA01" \
127-
-i "pandas.api.types.is_categorical_dtype SA01" \
128-
-i "pandas.api.types.is_complex PR01,SA01" \
129-
-i "pandas.api.types.is_complex_dtype SA01" \
130-
-i "pandas.api.types.is_datetime64_dtype SA01" \
131-
-i "pandas.api.types.is_datetime64_ns_dtype SA01" \
132-
-i "pandas.api.types.is_datetime64tz_dtype SA01" \
133-
-i "pandas.api.types.is_dict_like PR07,SA01" \
134-
-i "pandas.api.types.is_extension_array_dtype SA01" \
135-
-i "pandas.api.types.is_file_like PR07,SA01" \
136109
-i "pandas.api.types.is_float PR01,SA01" \
137-
-i "pandas.api.types.is_float_dtype SA01" \
138-
-i "pandas.api.types.is_hashable PR01,RT03,SA01" \
139-
-i "pandas.api.types.is_int64_dtype SA01" \
140110
-i "pandas.api.types.is_integer PR01,SA01" \
141-
-i "pandas.api.types.is_integer_dtype SA01" \
142-
-i "pandas.api.types.is_interval_dtype SA01" \
143111
-i "pandas.api.types.is_iterator PR07,SA01" \
144-
-i "pandas.api.types.is_list_like SA01" \
145-
-i "pandas.api.types.is_named_tuple PR07,SA01" \
146-
-i "pandas.api.types.is_object_dtype SA01" \
147-
-i "pandas.api.types.is_re PR07,SA01" \
148112
-i "pandas.api.types.is_re_compilable PR07,SA01" \
149113
-i "pandas.api.types.pandas_dtype PR07,RT03,SA01" \
150114
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
151-
-i "pandas.arrays.BooleanArray SA01" \
152115
-i "pandas.arrays.DatetimeArray SA01" \
153-
-i "pandas.arrays.FloatingArray SA01" \
154116
-i "pandas.arrays.IntegerArray SA01" \
155117
-i "pandas.arrays.IntervalArray.left SA01" \
156118
-i "pandas.arrays.IntervalArray.length SA01" \
157-
-i "pandas.arrays.IntervalArray.mid SA01" \
158119
-i "pandas.arrays.IntervalArray.right SA01" \
159120
-i "pandas.arrays.NumpyExtensionArray SA01" \
160121
-i "pandas.arrays.SparseArray PR07,SA01" \
161122
-i "pandas.arrays.TimedeltaArray PR07,SA01" \
162123
-i "pandas.core.groupby.DataFrameGroupBy.__iter__ RT03,SA01" \
163-
-i "pandas.core.groupby.DataFrameGroupBy.agg RT03" \
164-
-i "pandas.core.groupby.DataFrameGroupBy.aggregate RT03" \
165124
-i "pandas.core.groupby.DataFrameGroupBy.boxplot PR07,RT03,SA01" \
166-
-i "pandas.core.groupby.DataFrameGroupBy.filter SA01" \
167125
-i "pandas.core.groupby.DataFrameGroupBy.get_group RT03,SA01" \
168126
-i "pandas.core.groupby.DataFrameGroupBy.groups SA01" \
169-
-i "pandas.core.groupby.DataFrameGroupBy.hist RT03" \
170127
-i "pandas.core.groupby.DataFrameGroupBy.indices SA01" \
171-
-i "pandas.core.groupby.DataFrameGroupBy.max SA01" \
172-
-i "pandas.core.groupby.DataFrameGroupBy.min SA01" \
173128
-i "pandas.core.groupby.DataFrameGroupBy.nth PR02" \
174129
-i "pandas.core.groupby.DataFrameGroupBy.nunique SA01" \
175130
-i "pandas.core.groupby.DataFrameGroupBy.ohlc SA01" \
176131
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
177132
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
178-
-i "pandas.core.groupby.DataFrameGroupBy.sum SA01" \
179133
-i "pandas.core.groupby.SeriesGroupBy.__iter__ RT03,SA01" \
180-
-i "pandas.core.groupby.SeriesGroupBy.agg RT03" \
181-
-i "pandas.core.groupby.SeriesGroupBy.aggregate RT03" \
182-
-i "pandas.core.groupby.SeriesGroupBy.filter PR01,SA01" \
183134
-i "pandas.core.groupby.SeriesGroupBy.get_group RT03,SA01" \
184135
-i "pandas.core.groupby.SeriesGroupBy.groups SA01" \
185136
-i "pandas.core.groupby.SeriesGroupBy.indices SA01" \
186137
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_decreasing SA01" \
187138
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_increasing SA01" \
188-
-i "pandas.core.groupby.SeriesGroupBy.max SA01" \
189-
-i "pandas.core.groupby.SeriesGroupBy.min SA01" \
190139
-i "pandas.core.groupby.SeriesGroupBy.nth PR02" \
191140
-i "pandas.core.groupby.SeriesGroupBy.ohlc SA01" \
192141
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
193142
-i "pandas.core.groupby.SeriesGroupBy.sem SA01" \
194-
-i "pandas.core.groupby.SeriesGroupBy.sum SA01" \
195143
-i "pandas.core.resample.Resampler.__iter__ RT03,SA01" \
196-
-i "pandas.core.resample.Resampler.ffill RT03" \
197144
-i "pandas.core.resample.Resampler.get_group RT03,SA01" \
198145
-i "pandas.core.resample.Resampler.groups SA01" \
199146
-i "pandas.core.resample.Resampler.indices SA01" \
@@ -208,24 +155,19 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
208155
-i "pandas.core.resample.Resampler.sum SA01" \
209156
-i "pandas.core.resample.Resampler.transform PR01,RT03,SA01" \
210157
-i "pandas.core.resample.Resampler.var SA01" \
211-
-i "pandas.date_range RT03" \
212158
-i "pandas.errors.AttributeConflictWarning SA01" \
213159
-i "pandas.errors.CSSWarning SA01" \
214160
-i "pandas.errors.CategoricalConversionWarning SA01" \
215161
-i "pandas.errors.ChainedAssignmentError SA01" \
216-
-i "pandas.errors.ClosedFileError SA01" \
217162
-i "pandas.errors.DataError SA01" \
218163
-i "pandas.errors.DuplicateLabelError SA01" \
219-
-i "pandas.errors.EmptyDataError SA01" \
220164
-i "pandas.errors.IntCastingNaNError SA01" \
221165
-i "pandas.errors.InvalidIndexError SA01" \
222166
-i "pandas.errors.InvalidVersion SA01" \
223-
-i "pandas.errors.MergeError SA01" \
224167
-i "pandas.errors.NullFrequencyError SA01" \
225168
-i "pandas.errors.NumExprClobberingError SA01" \
226169
-i "pandas.errors.NumbaUtilError SA01" \
227170
-i "pandas.errors.OptionError SA01" \
228-
-i "pandas.errors.OutOfBoundsDatetime SA01" \
229171
-i "pandas.errors.OutOfBoundsTimedelta SA01" \
230172
-i "pandas.errors.PerformanceWarning SA01" \
231173
-i "pandas.errors.PossibleDataLossError SA01" \
@@ -237,17 +179,14 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
237179
-i "pandas.errors.ValueLabelTypeMismatch SA01" \
238180
-i "pandas.infer_freq SA01" \
239181
-i "pandas.io.json.build_table_schema PR07,RT03,SA01" \
240-
-i "pandas.io.stata.StataReader.data_label SA01" \
241182
-i "pandas.io.stata.StataReader.value_labels RT03,SA01" \
242183
-i "pandas.io.stata.StataReader.variable_labels RT03,SA01" \
243184
-i "pandas.io.stata.StataWriter.write_file SA01" \
244185
-i "pandas.json_normalize RT03,SA01" \
245-
-i "pandas.period_range RT03,SA01" \
246186
-i "pandas.plotting.andrews_curves RT03,SA01" \
247187
-i "pandas.plotting.lag_plot RT03,SA01" \
248188
-i "pandas.plotting.scatter_matrix PR07,SA01" \
249189
-i "pandas.set_eng_float_format RT03,SA01" \
250-
-i "pandas.testing.assert_extension_array_equal SA01" \
251190
-i "pandas.tseries.offsets.BDay PR02,SA01" \
252191
-i "pandas.tseries.offsets.BQuarterBegin.is_on_offset GL08" \
253192
-i "pandas.tseries.offsets.BQuarterBegin.n GL08" \
@@ -399,7 +338,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
399338
-i "pandas.tseries.offsets.SemiMonthBegin.n GL08" \
400339
-i "pandas.tseries.offsets.SemiMonthBegin.normalize GL08" \
401340
-i "pandas.tseries.offsets.SemiMonthBegin.rule_code GL08" \
402-
-i "pandas.tseries.offsets.SemiMonthEnd SA01" \
403341
-i "pandas.tseries.offsets.SemiMonthEnd.day_of_month GL08" \
404342
-i "pandas.tseries.offsets.SemiMonthEnd.is_on_offset GL08" \
405343
-i "pandas.tseries.offsets.SemiMonthEnd.n GL08" \
@@ -413,7 +351,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
413351
-i "pandas.tseries.offsets.Week.n GL08" \
414352
-i "pandas.tseries.offsets.Week.normalize GL08" \
415353
-i "pandas.tseries.offsets.Week.weekday GL08" \
416-
-i "pandas.tseries.offsets.WeekOfMonth SA01" \
417354
-i "pandas.tseries.offsets.WeekOfMonth.is_on_offset GL08" \
418355
-i "pandas.tseries.offsets.WeekOfMonth.n GL08" \
419356
-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",

0 commit comments

Comments
 (0)