Skip to content

Commit 3cb1b55

Browse files
jorisvandenbosschejorisvandenbossche
committed
Merge remote-tracking branch 'upstream/main' into string-dtype-predicates-nan-propagation
2 parents e401b55 + 8303af3 commit 3cb1b55

File tree

147 files changed

+2263
-1148
lines changed

Some content is hidden

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

147 files changed

+2263
-1148
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: 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
types: [ labeled, opened, synchronize, reopened ]
1313

1414
permissions:
@@ -67,7 +67,7 @@ jobs:
6767
fetch-depth: 0
6868

6969
- name: Set up Python
70-
uses: mamba-org/setup-micromamba@v1
70+
uses: mamba-org/setup-micromamba@v2
7171
with:
7272
environment-name: recipe-test
7373
create-args: >-

‎.github/workflows/unit-tests.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
paths-ignore:
1313
- "doc/**"
1414
- "web/**"

‎.github/workflows/wheels.yml‎

Lines changed: 2 additions & 6 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
@@ -167,7 +165,7 @@ jobs:
167165
CIBW_PLATFORM: ${{ matrix.buildplat[1] == 'pyodide_wasm32' && 'pyodide' || 'auto' }}
168166

169167
- name: Set up Python
170-
uses: mamba-org/setup-micromamba@v1
168+
uses: mamba-org/setup-micromamba@v2
171169
with:
172170
environment-name: wheel-env
173171
# Use a fixed Python, since we might have an unreleased Python not
@@ -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
"@

‎.pre-commit-config.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ci:
1919
skip: [pyright, mypy]
2020
repos:
2121
- repo: https://github.com/astral-sh/ruff-pre-commit
22-
rev: v0.5.0
22+
rev: v0.6.9
2323
hooks:
2424
- id: ruff
2525
args: [--exit-non-zero-on-fix]
@@ -34,7 +34,7 @@ repos:
3434
- id: ruff-format
3535
exclude: ^scripts|^pandas/tests/frame/test_query_eval.py
3636
- repo: https://github.com/jendrikseipp/vulture
37-
rev: 'v2.11'
37+
rev: 'v2.13'
3838
hooks:
3939
- id: vulture
4040
entry: python scripts/run_vulture.py
@@ -52,7 +52,7 @@ repos:
5252
- id: cython-lint
5353
- id: double-quote-cython-strings
5454
- repo: https://github.com/pre-commit/pre-commit-hooks
55-
rev: v4.6.0
55+
rev: v5.0.0
5656
hooks:
5757
- id: check-case-conflict
5858
- id: check-toml
@@ -90,12 +90,12 @@ repos:
9090
types: [text] # overwrite types: [rst]
9191
types_or: [python, rst]
9292
- repo: https://github.com/sphinx-contrib/sphinx-lint
93-
rev: v0.9.1
93+
rev: v1.0.0
9494
hooks:
9595
- id: sphinx-lint
9696
args: ["--enable", "all", "--disable", "line-too-long"]
9797
- repo: https://github.com/pre-commit/mirrors-clang-format
98-
rev: v18.1.8
98+
rev: v19.1.1
9999
hooks:
100100
- id: clang-format
101101
files: ^pandas/_libs/src|^pandas/_libs/include

‎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 & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -73,87 +73,41 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
7373
-i "pandas.Period.freq GL08" \
7474
-i "pandas.Period.ordinal GL08" \
7575
-i "pandas.RangeIndex.from_range PR01,SA01" \
76-
-i "pandas.RangeIndex.step SA01" \
77-
-i "pandas.Series.cat.add_categories PR01,PR02" \
78-
-i "pandas.Series.cat.as_ordered PR01" \
79-
-i "pandas.Series.cat.as_unordered PR01" \
80-
-i "pandas.Series.cat.remove_categories PR01,PR02" \
81-
-i "pandas.Series.cat.remove_unused_categories PR01" \
82-
-i "pandas.Series.cat.rename_categories PR01,PR02" \
83-
-i "pandas.Series.cat.reorder_categories PR01,PR02" \
84-
-i "pandas.Series.cat.set_categories PR01,PR02" \
85-
-i "pandas.Series.dt.as_unit PR01,PR02" \
86-
-i "pandas.Series.dt.ceil PR01,PR02" \
87-
-i "pandas.Series.dt.day_name PR01,PR02" \
88-
-i "pandas.Series.dt.floor PR01,PR02" \
8976
-i "pandas.Series.dt.freq GL08" \
90-
-i "pandas.Series.dt.month_name PR01,PR02" \
91-
-i "pandas.Series.dt.normalize PR01" \
92-
-i "pandas.Series.dt.round PR01,PR02" \
93-
-i "pandas.Series.dt.strftime PR01,PR02" \
94-
-i "pandas.Series.dt.to_period PR01,PR02" \
95-
-i "pandas.Series.dt.total_seconds PR01" \
96-
-i "pandas.Series.dt.tz_convert PR01,PR02" \
97-
-i "pandas.Series.dt.tz_localize PR01,PR02" \
9877
-i "pandas.Series.dt.unit GL08" \
9978
-i "pandas.Series.pad PR01,SA01" \
100-
-i "pandas.Series.sparse.fill_value SA01" \
101-
-i "pandas.Series.sparse.from_coo PR07,SA01" \
102-
-i "pandas.Series.sparse.npoints SA01" \
103-
-i "pandas.Series.sparse.sp_values SA01" \
10479
-i "pandas.Timedelta.max PR02" \
10580
-i "pandas.Timedelta.min PR02" \
10681
-i "pandas.Timedelta.resolution PR02" \
107-
-i "pandas.Timedelta.to_timedelta64 SA01" \
108-
-i "pandas.TimedeltaIndex.to_pytimedelta RT03,SA01" \
10982
-i "pandas.Timestamp.max PR02" \
11083
-i "pandas.Timestamp.min PR02" \
11184
-i "pandas.Timestamp.nanosecond GL08" \
11285
-i "pandas.Timestamp.resolution PR02" \
11386
-i "pandas.Timestamp.tzinfo GL08" \
11487
-i "pandas.Timestamp.year GL08" \
115-
-i "pandas.api.types.is_dict_like PR07,SA01" \
116-
-i "pandas.api.types.is_file_like PR07,SA01" \
117-
-i "pandas.api.types.is_float PR01,SA01" \
118-
-i "pandas.api.types.is_float_dtype SA01" \
119-
-i "pandas.api.types.is_hashable PR01,RT03,SA01" \
120-
-i "pandas.api.types.is_int64_dtype SA01" \
12188
-i "pandas.api.types.is_integer PR01,SA01" \
122-
-i "pandas.api.types.is_interval_dtype SA01" \
12389
-i "pandas.api.types.is_iterator PR07,SA01" \
124-
-i "pandas.api.types.is_list_like SA01" \
125-
-i "pandas.api.types.is_named_tuple PR07,SA01" \
126-
-i "pandas.api.types.is_object_dtype SA01" \
127-
-i "pandas.api.types.is_re PR07,SA01" \
12890
-i "pandas.api.types.is_re_compilable PR07,SA01" \
12991
-i "pandas.api.types.pandas_dtype PR07,RT03,SA01" \
13092
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
131-
-i "pandas.arrays.BooleanArray SA01" \
132-
-i "pandas.arrays.DatetimeArray SA01" \
13393
-i "pandas.arrays.IntegerArray SA01" \
13494
-i "pandas.arrays.IntervalArray.left SA01" \
13595
-i "pandas.arrays.IntervalArray.length SA01" \
136-
-i "pandas.arrays.IntervalArray.mid SA01" \
13796
-i "pandas.arrays.IntervalArray.right SA01" \
13897
-i "pandas.arrays.NumpyExtensionArray SA01" \
13998
-i "pandas.arrays.SparseArray PR07,SA01" \
14099
-i "pandas.arrays.TimedeltaArray PR07,SA01" \
141100
-i "pandas.core.groupby.DataFrameGroupBy.__iter__ RT03,SA01" \
142-
-i "pandas.core.groupby.DataFrameGroupBy.agg RT03" \
143-
-i "pandas.core.groupby.DataFrameGroupBy.aggregate RT03" \
144101
-i "pandas.core.groupby.DataFrameGroupBy.boxplot PR07,RT03,SA01" \
145102
-i "pandas.core.groupby.DataFrameGroupBy.get_group RT03,SA01" \
146103
-i "pandas.core.groupby.DataFrameGroupBy.groups SA01" \
147-
-i "pandas.core.groupby.DataFrameGroupBy.hist RT03" \
148104
-i "pandas.core.groupby.DataFrameGroupBy.indices SA01" \
149105
-i "pandas.core.groupby.DataFrameGroupBy.nth PR02" \
150106
-i "pandas.core.groupby.DataFrameGroupBy.nunique SA01" \
151107
-i "pandas.core.groupby.DataFrameGroupBy.ohlc SA01" \
152108
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
153109
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
154110
-i "pandas.core.groupby.SeriesGroupBy.__iter__ RT03,SA01" \
155-
-i "pandas.core.groupby.SeriesGroupBy.agg RT03" \
156-
-i "pandas.core.groupby.SeriesGroupBy.aggregate RT03" \
157111
-i "pandas.core.groupby.SeriesGroupBy.get_group RT03,SA01" \
158112
-i "pandas.core.groupby.SeriesGroupBy.groups SA01" \
159113
-i "pandas.core.groupby.SeriesGroupBy.indices SA01" \
@@ -164,7 +118,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
164118
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
165119
-i "pandas.core.groupby.SeriesGroupBy.sem SA01" \
166120
-i "pandas.core.resample.Resampler.__iter__ RT03,SA01" \
167-
-i "pandas.core.resample.Resampler.ffill RT03" \
168121
-i "pandas.core.resample.Resampler.get_group RT03,SA01" \
169122
-i "pandas.core.resample.Resampler.groups SA01" \
170123
-i "pandas.core.resample.Resampler.indices SA01" \
@@ -179,45 +132,32 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
179132
-i "pandas.core.resample.Resampler.sum SA01" \
180133
-i "pandas.core.resample.Resampler.transform PR01,RT03,SA01" \
181134
-i "pandas.core.resample.Resampler.var SA01" \
182-
-i "pandas.date_range RT03" \
183135
-i "pandas.errors.AttributeConflictWarning SA01" \
184136
-i "pandas.errors.CSSWarning SA01" \
185-
-i "pandas.errors.CategoricalConversionWarning SA01" \
186137
-i "pandas.errors.ChainedAssignmentError SA01" \
187-
-i "pandas.errors.ClosedFileError SA01" \
188138
-i "pandas.errors.DataError SA01" \
189139
-i "pandas.errors.DuplicateLabelError SA01" \
190-
-i "pandas.errors.EmptyDataError SA01" \
191140
-i "pandas.errors.IntCastingNaNError SA01" \
192141
-i "pandas.errors.InvalidIndexError SA01" \
193-
-i "pandas.errors.InvalidVersion SA01" \
194142
-i "pandas.errors.NullFrequencyError SA01" \
195143
-i "pandas.errors.NumExprClobberingError SA01" \
196144
-i "pandas.errors.NumbaUtilError SA01" \
197145
-i "pandas.errors.OptionError SA01" \
198-
-i "pandas.errors.OutOfBoundsDatetime SA01" \
199146
-i "pandas.errors.OutOfBoundsTimedelta SA01" \
200147
-i "pandas.errors.PerformanceWarning SA01" \
201148
-i "pandas.errors.PossibleDataLossError SA01" \
202149
-i "pandas.errors.PossiblePrecisionLoss SA01" \
203-
-i "pandas.errors.SpecificationError SA01" \
204150
-i "pandas.errors.UndefinedVariableError PR01,SA01" \
205151
-i "pandas.errors.UnsortedIndexError SA01" \
206152
-i "pandas.errors.UnsupportedFunctionCall SA01" \
207153
-i "pandas.errors.ValueLabelTypeMismatch SA01" \
208154
-i "pandas.infer_freq SA01" \
209155
-i "pandas.io.json.build_table_schema PR07,RT03,SA01" \
210-
-i "pandas.io.stata.StataReader.data_label SA01" \
211-
-i "pandas.io.stata.StataReader.value_labels RT03,SA01" \
212-
-i "pandas.io.stata.StataReader.variable_labels RT03,SA01" \
213156
-i "pandas.io.stata.StataWriter.write_file SA01" \
214157
-i "pandas.json_normalize RT03,SA01" \
215-
-i "pandas.period_range RT03,SA01" \
216158
-i "pandas.plotting.andrews_curves RT03,SA01" \
217-
-i "pandas.plotting.lag_plot RT03,SA01" \
218159
-i "pandas.plotting.scatter_matrix PR07,SA01" \
219160
-i "pandas.set_eng_float_format RT03,SA01" \
220-
-i "pandas.testing.assert_extension_array_equal SA01" \
221161
-i "pandas.tseries.offsets.BDay PR02,SA01" \
222162
-i "pandas.tseries.offsets.BQuarterBegin.is_on_offset GL08" \
223163
-i "pandas.tseries.offsets.BQuarterBegin.n GL08" \
@@ -369,7 +309,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
369309
-i "pandas.tseries.offsets.SemiMonthBegin.n GL08" \
370310
-i "pandas.tseries.offsets.SemiMonthBegin.normalize GL08" \
371311
-i "pandas.tseries.offsets.SemiMonthBegin.rule_code GL08" \
372-
-i "pandas.tseries.offsets.SemiMonthEnd SA01" \
373312
-i "pandas.tseries.offsets.SemiMonthEnd.day_of_month GL08" \
374313
-i "pandas.tseries.offsets.SemiMonthEnd.is_on_offset GL08" \
375314
-i "pandas.tseries.offsets.SemiMonthEnd.n GL08" \
@@ -383,7 +322,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
383322
-i "pandas.tseries.offsets.Week.n GL08" \
384323
-i "pandas.tseries.offsets.Week.normalize GL08" \
385324
-i "pandas.tseries.offsets.Week.weekday GL08" \
386-
-i "pandas.tseries.offsets.WeekOfMonth SA01" \
387325
-i "pandas.tseries.offsets.WeekOfMonth.is_on_offset GL08" \
388326
-i "pandas.tseries.offsets.WeekOfMonth.n GL08" \
389327
-i "pandas.tseries.offsets.WeekOfMonth.normalize GL08" \

0 commit comments

Comments
 (0)