Skip to content

Commit 1ce479c

Browse files
Wong2333Wong2333
authored
Merge branch 'pandas-dev:main' into main
2 parents 3de6784 + 8a286fa commit 1ce479c

File tree

319 files changed

+3691
-2006
lines changed

Some content is hidden

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

319 files changed

+3691
-2006
lines changed

‎.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,5 @@ pandas/tests/io/parser/data export-ignore
8585

8686
# Include cibw script in sdist since it's needed for building wheels
8787
scripts/cibw_before_build.sh -export-ignore
88-
scripts/cibw_before_test.sh -export-ignore
88+
scripts/cibw_before_build_windows.sh -export-ignore
89+
scripts/cibw_before_test_windows.sh -export-ignore

‎.github/actions/build_pandas/action.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ runs:
2222
fi
2323
shell: bash -el {0}
2424

25-
- name: Uninstall nomkl
26-
run: |
27-
if conda list nomkl | grep nomkl 1>/dev/null; then
28-
conda remove nomkl -y
29-
fi
30-
shell: bash -el {0}
31-
3225
- name: Build Pandas
3326
run: |
3427
if [[ ${{ inputs.editable }} == "true" ]]; then

‎.github/actions/setup-conda/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ 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'
1412
environment-file: ${{ inputs.environment-file }}
1513
environment-name: test
1614
condarc-file: ci/.condarc

‎.github/workflows/unit-tests.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ jobs:
8686
TEST_ARGS: ${{ matrix.test_args || '' }}
8787
PYTEST_WORKERS: 'auto'
8888
PYTEST_TARGET: ${{ matrix.pytest_target || 'pandas' }}
89-
NPY_PROMOTION_STATE: ${{ matrix.env_file == 'actions-311-numpydev.yaml' && 'weak' || 'legacy' }}
9089
# Clipboard tests
9190
QT_QPA_PLATFORM: offscreen
9291
REMOVE_PYARROW: ${{ matrix.name == 'Future infer strings (without pyarrow)' && '1' || '0' }}
@@ -388,8 +387,8 @@ jobs:
388387
- name: Build Environment
389388
run: |
390389
python --version
391-
python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1
392-
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy cython
390+
python -m pip install --upgrade pip setuptools wheel numpy meson[ninja]==1.2.1 meson-python==0.13.1
391+
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple cython
393392
python -m pip install versioneer[toml]
394393
python -m pip install python-dateutil pytz tzdata hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov
395394
python -m pip install -ve . --no-build-isolation --no-index --no-deps -Csetup-args="--werror"

‎.github/workflows/wheels.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ jobs:
111111
- buildplat: [ubuntu-22.04, pyodide_wasm32]
112112
python: ["cp312", "3.12"]
113113
cibw_build_frontend: 'build'
114-
# TODO: Build free-threaded wheels for Windows
115-
exclude:
116-
- buildplat: [windows-2022, win_amd64]
117-
python: ["cp313t", "3.13"]
118114

119115
env:
120116
IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
@@ -156,7 +152,7 @@ jobs:
156152
run: echo "sdist_name=$(cd ./dist && ls -d */)" >> "$GITHUB_ENV"
157153

158154
- name: Build wheels
159-
uses: pypa/cibuildwheel@v2.21.0
155+
uses: pypa/cibuildwheel@v2.22.0
160156
with:
161157
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
162158
env:
@@ -181,20 +177,6 @@ jobs:
181177
shell: bash -el {0}
182178
run: for whl in $(ls wheelhouse); do wheel unpack wheelhouse/$whl -d /tmp; done
183179

184-
# Testing on windowsservercore instead of GHA runner to fail on missing DLLs
185-
- name: Test Windows Wheels
186-
if: ${{ matrix.buildplat[1] == 'win_amd64' }}
187-
shell: pwsh
188-
run: |
189-
$TST_CMD = @"
190-
python -m pip install hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0;
191-
python -m pip install `$(Get-Item pandas\wheelhouse\*.whl);
192-
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`\"])`';
193-
"@
194-
# add rc to the end of the image name if the Python version is unreleased
195-
docker pull python:${{ matrix.python[1] == '3.13' && '3.13-rc' || format('{0}-windowsservercore', matrix.python[1]) }}
196-
docker run --env PANDAS_CI='1' -v ${PWD}:C:\pandas python:${{ matrix.python[1] == '3.13' && '3.13-rc' || format('{0}-windowsservercore', matrix.python[1]) }} powershell -Command $TST_CMD
197-
198180
- uses: actions/upload-artifact@v4
199181
with:
200182
name: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}

‎.pre-commit-config.yaml

Lines changed: 4 additions & 4 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.6.9
22+
rev: v0.8.1
2323
hooks:
2424
- id: ruff
2525
args: [--exit-non-zero-on-fix]
@@ -47,7 +47,7 @@ repos:
4747
types_or: [python, rst, markdown, cython, c]
4848
additional_dependencies: [tomli]
4949
- repo: https://github.com/MarcoGorelli/cython-lint
50-
rev: v0.16.2
50+
rev: v0.16.6
5151
hooks:
5252
- id: cython-lint
5353
- id: double-quote-cython-strings
@@ -74,7 +74,7 @@ repos:
7474
hooks:
7575
- id: isort
7676
- repo: https://github.com/asottile/pyupgrade
77-
rev: v3.17.0
77+
rev: v3.19.0
7878
hooks:
7979
- id: pyupgrade
8080
args: [--py310-plus]
@@ -95,7 +95,7 @@ repos:
9595
- id: sphinx-lint
9696
args: ["--enable", "all", "--disable", "line-too-long"]
9797
- repo: https://github.com/pre-commit/mirrors-clang-format
98-
rev: v19.1.1
98+
rev: v19.1.4
9999
hooks:
100100
- id: clang-format
101101
files: ^pandas/_libs/src|^pandas/_libs/include

‎MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,5 @@ 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_build_windows.sh
69+
include scripts/cibw_before_test_windows.sh

‎asv_bench/benchmarks/groupby.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,7 @@ def setup(self, dtype, method, application, ncols, engine):
511511
# grouping on multiple columns
512512
# and we lack kernels for a bunch of methods
513513
if (
514-
engine == "numba"
515-
and method in _numba_unsupported_methods
514+
(engine == "numba" and method in _numba_unsupported_methods)
516515
or ncols > 1
517516
or application == "transformation"
518517
or dtype == "datetime"

‎ci/code_checks.sh

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -73,78 +73,36 @@ 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.Series.dt.freq GL08" \
77-
-i "pandas.Series.dt.unit GL08" \
78-
-i "pandas.Series.pad PR01,SA01" \
7976
-i "pandas.Timedelta.max PR02" \
8077
-i "pandas.Timedelta.min PR02" \
8178
-i "pandas.Timedelta.resolution PR02" \
8279
-i "pandas.Timestamp.max PR02" \
8380
-i "pandas.Timestamp.min PR02" \
84-
-i "pandas.Timestamp.nanosecond GL08" \
8581
-i "pandas.Timestamp.resolution PR02" \
8682
-i "pandas.Timestamp.tzinfo GL08" \
87-
-i "pandas.Timestamp.year GL08" \
88-
-i "pandas.api.types.is_iterator PR07,SA01" \
89-
-i "pandas.api.types.is_re_compilable PR07,SA01" \
90-
-i "pandas.api.types.pandas_dtype PR07,RT03,SA01" \
9183
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
92-
-i "pandas.arrays.IntegerArray SA01" \
93-
-i "pandas.arrays.IntervalArray.left SA01" \
9484
-i "pandas.arrays.IntervalArray.length SA01" \
95-
-i "pandas.arrays.IntervalArray.right SA01" \
9685
-i "pandas.arrays.NumpyExtensionArray SA01" \
97-
-i "pandas.arrays.SparseArray PR07,SA01" \
9886
-i "pandas.arrays.TimedeltaArray PR07,SA01" \
9987
-i "pandas.core.groupby.DataFrameGroupBy.boxplot PR07,RT03,SA01" \
100-
-i "pandas.core.groupby.DataFrameGroupBy.get_group RT03,SA01" \
101-
-i "pandas.core.groupby.DataFrameGroupBy.groups SA01" \
102-
-i "pandas.core.groupby.DataFrameGroupBy.indices SA01" \
103-
-i "pandas.core.groupby.DataFrameGroupBy.nth PR02" \
104-
-i "pandas.core.groupby.DataFrameGroupBy.nunique SA01" \
10588
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
106-
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
107-
-i "pandas.core.groupby.SeriesGroupBy.get_group RT03,SA01" \
108-
-i "pandas.core.groupby.SeriesGroupBy.groups SA01" \
109-
-i "pandas.core.groupby.SeriesGroupBy.indices SA01" \
110-
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_decreasing SA01" \
111-
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_increasing SA01" \
112-
-i "pandas.core.groupby.SeriesGroupBy.nth PR02" \
11389
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
114-
-i "pandas.core.groupby.SeriesGroupBy.sem SA01" \
115-
-i "pandas.core.resample.Resampler.get_group RT03,SA01" \
116-
-i "pandas.core.resample.Resampler.groups SA01" \
117-
-i "pandas.core.resample.Resampler.indices SA01" \
11890
-i "pandas.core.resample.Resampler.max PR01,RT03,SA01" \
11991
-i "pandas.core.resample.Resampler.mean SA01" \
12092
-i "pandas.core.resample.Resampler.min PR01,RT03,SA01" \
12193
-i "pandas.core.resample.Resampler.prod SA01" \
12294
-i "pandas.core.resample.Resampler.quantile PR01,PR07" \
123-
-i "pandas.core.resample.Resampler.sem SA01" \
12495
-i "pandas.core.resample.Resampler.std SA01" \
12596
-i "pandas.core.resample.Resampler.transform PR01,RT03,SA01" \
12697
-i "pandas.core.resample.Resampler.var SA01" \
127-
-i "pandas.errors.AttributeConflictWarning SA01" \
128-
-i "pandas.errors.ChainedAssignmentError SA01" \
129-
-i "pandas.errors.DataError SA01" \
130-
-i "pandas.errors.DuplicateLabelError SA01" \
131-
-i "pandas.errors.IntCastingNaNError SA01" \
132-
-i "pandas.errors.InvalidIndexError SA01" \
13398
-i "pandas.errors.NullFrequencyError SA01" \
134-
-i "pandas.errors.NumExprClobberingError SA01" \
13599
-i "pandas.errors.NumbaUtilError SA01" \
136-
-i "pandas.errors.OutOfBoundsTimedelta SA01" \
137100
-i "pandas.errors.PerformanceWarning SA01" \
138-
-i "pandas.errors.PossibleDataLossError SA01" \
139101
-i "pandas.errors.UndefinedVariableError PR01,SA01" \
140-
-i "pandas.errors.UnsortedIndexError SA01" \
141102
-i "pandas.errors.ValueLabelTypeMismatch SA01" \
142-
-i "pandas.infer_freq SA01" \
143103
-i "pandas.io.json.build_table_schema PR07,RT03,SA01" \
144-
-i "pandas.io.stata.StataWriter.write_file SA01" \
145104
-i "pandas.plotting.andrews_curves RT03,SA01" \
146105
-i "pandas.plotting.scatter_matrix PR07,SA01" \
147-
-i "pandas.set_eng_float_format RT03,SA01" \
148106
-i "pandas.tseries.offsets.BDay PR02,SA01" \
149107
-i "pandas.tseries.offsets.BQuarterBegin.is_on_offset GL08" \
150108
-i "pandas.tseries.offsets.BQuarterBegin.n GL08" \

‎ci/deps/actions-310-minimum_versions.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ dependencies:
77
- python=3.10
88

99
# build dependencies
10-
- versioneer[toml]
10+
- versioneer
1111
- cython>=0.29.33
12-
- meson[ninja]=1.2.1
12+
- meson=1.2.1
1313
- meson-python=0.13.1
1414

1515
# test dependencies

0 commit comments

Comments
 (0)