Skip to content

Commit b287abb

Browse files
anzoranzor
anzor
authored and
anzor
committed
Merge remote-tracking branch 'upstream/main' into fix59933
2 parents 27f1122 + ee3c18f commit b287abb

File tree

210 files changed

+2183
-1167
lines changed

Some content is hidden

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

210 files changed

+2183
-1167
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: 0 additions & 18 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') }}
@@ -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: 3 additions & 3 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.7.2
2323
hooks:
2424
- id: ruff
2525
args: [--exit-non-zero-on-fix]
@@ -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.3
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

‎ci/code_checks.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,38 +81,30 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
8181
-i "pandas.Timedelta.resolution PR02" \
8282
-i "pandas.Timestamp.max PR02" \
8383
-i "pandas.Timestamp.min PR02" \
84-
-i "pandas.Timestamp.nanosecond GL08" \
8584
-i "pandas.Timestamp.resolution PR02" \
8685
-i "pandas.Timestamp.tzinfo GL08" \
87-
-i "pandas.Timestamp.year GL08" \
8886
-i "pandas.api.types.is_re_compilable PR07,SA01" \
8987
-i "pandas.api.types.pandas_dtype PR07,RT03,SA01" \
9088
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
9189
-i "pandas.arrays.IntegerArray SA01" \
92-
-i "pandas.arrays.IntervalArray.left SA01" \
9390
-i "pandas.arrays.IntervalArray.length SA01" \
94-
-i "pandas.arrays.IntervalArray.right SA01" \
9591
-i "pandas.arrays.NumpyExtensionArray SA01" \
96-
-i "pandas.arrays.SparseArray PR07,SA01" \
9792
-i "pandas.arrays.TimedeltaArray PR07,SA01" \
9893
-i "pandas.core.groupby.DataFrameGroupBy.boxplot PR07,RT03,SA01" \
9994
-i "pandas.core.groupby.DataFrameGroupBy.get_group RT03,SA01" \
100-
-i "pandas.core.groupby.DataFrameGroupBy.groups SA01" \
10195
-i "pandas.core.groupby.DataFrameGroupBy.indices SA01" \
10296
-i "pandas.core.groupby.DataFrameGroupBy.nth PR02" \
10397
-i "pandas.core.groupby.DataFrameGroupBy.nunique SA01" \
10498
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
10599
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
106100
-i "pandas.core.groupby.SeriesGroupBy.get_group RT03,SA01" \
107-
-i "pandas.core.groupby.SeriesGroupBy.groups SA01" \
108101
-i "pandas.core.groupby.SeriesGroupBy.indices SA01" \
109102
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_decreasing SA01" \
110103
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_increasing SA01" \
111104
-i "pandas.core.groupby.SeriesGroupBy.nth PR02" \
112105
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
113106
-i "pandas.core.groupby.SeriesGroupBy.sem SA01" \
114107
-i "pandas.core.resample.Resampler.get_group RT03,SA01" \
115-
-i "pandas.core.resample.Resampler.groups SA01" \
116108
-i "pandas.core.resample.Resampler.indices SA01" \
117109
-i "pandas.core.resample.Resampler.max PR01,RT03,SA01" \
118110
-i "pandas.core.resample.Resampler.mean SA01" \
@@ -125,7 +117,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
125117
-i "pandas.core.resample.Resampler.var SA01" \
126118
-i "pandas.errors.AttributeConflictWarning SA01" \
127119
-i "pandas.errors.ChainedAssignmentError SA01" \
128-
-i "pandas.errors.DataError SA01" \
129120
-i "pandas.errors.DuplicateLabelError SA01" \
130121
-i "pandas.errors.IntCastingNaNError SA01" \
131122
-i "pandas.errors.InvalidIndexError SA01" \

‎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

‎ci/deps/actions-310.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ dependencies:
55
- python=3.10
66

77
# build dependencies
8-
- versioneer[toml]
8+
- versioneer
99
- cython>=0.29.33
10-
- meson[ninja]=1.2.1
10+
- meson=1.2.1
1111
- meson-python=0.13.1
1212

1313
# test dependencies

0 commit comments

Comments
 (0)