Skip to content

Commit 04e8ab7

Browse files
authored
Merge branch 'main' into fix/53098_numeric_only_disallow_non_bools
2 parents a520e54 + 944c527 commit 04e8ab7

File tree

567 files changed

+14614
-8141
lines changed

Some content is hidden

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

567 files changed

+14614
-8141
lines changed

.devcontainer.json

Lines changed: 0 additions & 28 deletions
This file was deleted.

.gitattributes

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,12 @@ pandas/_version.py export-subst
6565
asv_bench export-ignore
6666
ci export-ignore
6767
doc export-ignore
68-
gitpod export-ignore
6968
MANIFEST.in export-ignore
7069
scripts/** export-ignore
7170
typings export-ignore
7271
web export-ignore
7372
CITATION.cff export-ignore
7473
codecov.yml export-ignore
75-
Dockerfile export-ignore
7674
environment.yml export-ignore
7775
setup.py export-ignore
7876

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
- [ ] All [code checks passed](https://pandas.pydata.org/pandas-docs/dev/development/contributing_codebase.html#pre-commit).
44
- [ ] Added [type annotations](https://pandas.pydata.org/pandas-docs/dev/development/contributing_codebase.html#type-hints) to new arguments/methods/functions.
55
- [ ] Added an entry in the latest `doc/source/whatsnew/vX.X.X.rst` file if fixing a bug or adding a new feature.
6+
- [ ] If I used AI to develop this pull request, I prompted it to follow `AGENTS.md`.

.github/workflows/code-checks.yml

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: Checkout
36-
uses: actions/checkout@v5
36+
uses: actions/checkout@v6
3737
with:
3838
fetch-depth: 0
3939

@@ -114,7 +114,7 @@ jobs:
114114

115115
steps:
116116
- name: Checkout
117-
uses: actions/checkout@v5
117+
uses: actions/checkout@v6
118118
with:
119119
fetch-depth: 0
120120

@@ -131,33 +131,6 @@ jobs:
131131
asv machine --yes
132132
asv run --quick --dry-run --durations=30 --python=same --show-stderr
133133
134-
build_docker_dev_environment:
135-
name: Build Docker Dev Environment
136-
runs-on: ubuntu-24.04
137-
defaults:
138-
run:
139-
shell: bash -el {0}
140-
141-
concurrency:
142-
# https://github.community/t/concurrecy-not-work-for-push/183068/7
143-
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-build_docker_dev_environment
144-
cancel-in-progress: true
145-
146-
steps:
147-
- name: Clean up dangling images
148-
run: docker image prune -f
149-
150-
- name: Checkout
151-
uses: actions/checkout@v5
152-
with:
153-
fetch-depth: 0
154-
155-
- name: Build image
156-
run: docker build --pull --no-cache --tag pandas-dev-env .
157-
158-
- name: Show environment
159-
run: docker run --rm pandas-dev-env python -c "import pandas as pd; print(pd.show_versions())"
160-
161134
requirements-dev-text-installable:
162135
name: Test install requirements-dev.txt
163136
runs-on: ubuntu-24.04
@@ -169,7 +142,7 @@ jobs:
169142

170143
steps:
171144
- name: Checkout
172-
uses: actions/checkout@v5
145+
uses: actions/checkout@v6
173146
with:
174147
fetch-depth: 0
175148

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- python
2828

2929
steps:
30-
- uses: actions/checkout@v5
30+
- uses: actions/checkout@v6
3131
- uses: github/codeql-action/init@v4
3232
with:
3333
languages: ${{ matrix.language }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout
39-
uses: actions/checkout@v5
39+
uses: actions/checkout@v6
4040
with:
4141
fetch-depth: 0
4242

@@ -93,7 +93,7 @@ jobs:
9393
run: mv doc/build/html web/build/docs
9494

9595
- name: Save website as an artifact
96-
uses: actions/upload-artifact@v4
96+
uses: actions/upload-artifact@v5
9797
with:
9898
name: website
9999
path: web/build

.github/workflows/package-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: Checkout
37-
uses: actions/checkout@v5
37+
uses: actions/checkout@v6
3838
with:
3939
fetch-depth: 0
4040

@@ -58,7 +58,7 @@ jobs:
5858
cancel-in-progress: true
5959
steps:
6060
- name: Checkout
61-
uses: actions/checkout@v5
61+
uses: actions/checkout@v6
6262
with:
6363
fetch-depth: 0
6464

.github/workflows/unit-tests.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139

140140
steps:
141141
- name: Checkout
142-
uses: actions/checkout@v5
142+
uses: actions/checkout@v6
143143
with:
144144
fetch-depth: 0
145145

@@ -181,8 +181,7 @@ jobs:
181181
timeout-minutes: 90
182182
strategy:
183183
matrix:
184-
# Note: Don't use macOS latest since macos 14 appears to be arm64 only
185-
os: [macos-13, macos-14, windows-2025]
184+
os: [macos-15-intel, macos-15, windows-2025]
186185
env_file: [actions-311.yaml, actions-312.yaml, actions-313.yaml]
187186
fail-fast: false
188187
runs-on: ${{ matrix.os }}
@@ -199,7 +198,7 @@ jobs:
199198

200199
steps:
201200
- name: Checkout
202-
uses: actions/checkout@v5
201+
uses: actions/checkout@v6
203202
with:
204203
fetch-depth: 0
205204

@@ -217,7 +216,7 @@ jobs:
217216
Linux-32-bit:
218217
runs-on: ubuntu-24.04
219218
container:
220-
image: quay.io/pypa/manylinux2014_i686
219+
image: quay.io/pypa/manylinux_2_28_i686
221220
options: --platform linux/386
222221
steps:
223222
- name: Checkout pandas Repo
@@ -321,8 +320,7 @@ jobs:
321320
strategy:
322321
fail-fast: false
323322
matrix:
324-
# Separate out macOS 13 and 14, since macOS 14 is arm64 only
325-
os: [ubuntu-24.04, macOS-13, macOS-14, windows-2025]
323+
os: [ubuntu-24.04, macos-15-intel, macos-15, windows-2025]
326324

327325
timeout-minutes: 90
328326

@@ -338,7 +336,7 @@ jobs:
338336
PYTEST_TARGET: pandas
339337

340338
steps:
341-
- uses: actions/checkout@v5
339+
- uses: actions/checkout@v6
342340
with:
343341
fetch-depth: 0
344342

@@ -375,7 +373,7 @@ jobs:
375373
cancel-in-progress: true
376374
steps:
377375
- name: Checkout pandas Repo
378-
uses: actions/checkout@v5
376+
uses: actions/checkout@v6
379377
with:
380378
fetch-depth: 0
381379

@@ -399,7 +397,7 @@ jobs:
399397
pyodide build
400398
401399
- name: Set up Node.js
402-
uses: actions/setup-node@v5
400+
uses: actions/setup-node@v6
403401
with:
404402
node-version: '20'
405403

.github/workflows/wheels.yml

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ jobs:
3939
if: >-
4040
(github.event_name == 'schedule') ||
4141
github.event_name == 'workflow_dispatch' ||
42+
github.event_name == 'release' ||
4243
(github.event_name == 'pull_request' &&
4344
contains(github.event.pull_request.labels.*.name, 'Build')) ||
4445
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && ( ! endsWith(github.ref, 'dev0')))
4546
runs-on: ubuntu-24.04
4647
env:
47-
IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
4848
IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
4949
outputs:
5050
sdist_file: ${{ steps.save-path.outputs.sdist_name }}
5151
steps:
5252
- name: Checkout pandas
53-
uses: actions/checkout@v5
53+
uses: actions/checkout@v6
5454
with:
5555
fetch-depth: 0
5656

@@ -64,7 +64,7 @@ jobs:
6464
python -m pip install build
6565
python -m build --sdist
6666
67-
- uses: actions/upload-artifact@v4
67+
- uses: actions/upload-artifact@v5
6868
with:
6969
name: sdist
7070
path: ./dist/*
@@ -84,6 +84,7 @@ jobs:
8484
if: >-
8585
(github.event_name == 'schedule') ||
8686
github.event_name == 'workflow_dispatch' ||
87+
github.event_name == 'release' ||
8788
(github.event_name == 'pull_request' &&
8889
contains(github.event.pull_request.labels.*.name, 'Build')) ||
8990
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && ( ! endsWith(github.ref, 'dev0')))
@@ -98,10 +99,9 @@ jobs:
9899
- [ubuntu-24.04, musllinux_x86_64]
99100
- [ubuntu-24.04-arm, manylinux_aarch64]
100101
- [ubuntu-24.04-arm, musllinux_aarch64]
101-
- [macos-13, macosx_x86_64]
102-
# Note: M1 images on Github Actions start from macOS 14
103-
- [macos-14, macosx_arm64]
104-
- [windows-2022, win_amd64]
102+
- [macos-15-intel, macosx_x86_64]
103+
- [macos-15, macosx_arm64]
104+
- [windows-2025, win_amd64]
105105
- [windows-11-arm, win_arm64]
106106
python: [["cp311", "3.11"], ["cp312", "3.12"], ["cp313", "3.13"], ["cp313t", "3.13"], ["cp314", "3.14"], ["cp314t", "3.14"]]
107107
include:
@@ -117,11 +117,10 @@ jobs:
117117
python: ["cp313t", "3.13"]
118118

119119
env:
120-
IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
121120
IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
122121
steps:
123122
- name: Checkout pandas
124-
uses: actions/checkout@v5
123+
uses: actions/checkout@v6
125124
with:
126125
fetch-depth: 0
127126

@@ -139,7 +138,7 @@ jobs:
139138
# removes unnecessary files from the release
140139
- name: Download sdist (not macOS)
141140
#if: ${{ matrix.buildplat[1] != 'macosx_*' }}
142-
uses: actions/download-artifact@v5
141+
uses: actions/download-artifact@v6
143142
with:
144143
name: sdist
145144
path: ./dist
@@ -165,6 +164,7 @@ jobs:
165164
uses: pypa/cibuildwheel@v3.2.1
166165
with:
167166
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
167+
output-dir: ./dist
168168
env:
169169
CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
170170
CIBW_BUILD_FRONTEND: ${{ matrix.cibw_build_frontend || 'pip' }}
@@ -195,29 +195,19 @@ jobs:
195195

196196
- name: Validate wheel RECORD
197197
shell: bash -el {0}
198-
run: for whl in $(ls wheelhouse); do wheel unpack wheelhouse/$whl -d /tmp; done
198+
run: for whl in $(ls ./dist/*.whl); do wheel unpack $whl -d /tmp; done
199199

200-
- uses: actions/upload-artifact@v4
200+
- uses: actions/upload-artifact@v5
201201
with:
202202
name: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
203-
path: ./wheelhouse/*.whl
203+
path: ./dist/*.whl
204204

205205
- name: Upload wheels & sdist
206-
if: ${{ success() && (env.IS_SCHEDULE_DISPATCH == 'true' || env.IS_PUSH == 'true') }}
207-
shell: bash -el {0}
208-
env:
209-
PANDAS_STAGING_UPLOAD_TOKEN: ${{ secrets.PANDAS_STAGING_UPLOAD_TOKEN }}
210-
PANDAS_NIGHTLY_UPLOAD_TOKEN: ${{ secrets.PANDAS_NIGHTLY_UPLOAD_TOKEN }}
211-
# trigger an upload to
212-
# https://anaconda.org/scientific-python-nightly-wheels/pandas
213-
# for cron jobs or "Run workflow" (restricted to main branch).
214-
# Tags will upload to
215-
# https://anaconda.org/multibuild-wheels-staging/pandas
216-
# The tokens were originally generated at anaconda.org
217-
run: |
218-
source ci/upload_wheels.sh
219-
set_upload_vars
220-
upload_wheels
206+
if: ${{ success() && env.IS_SCHEDULE_DISPATCH == 'true' }}
207+
uses: scientific-python/upload-nightly-action@0.6.2
208+
with:
209+
artifacts_path: ./dist
210+
anaconda_nightly_upload_token: ${{secrets.PANDAS_NIGHTLY_UPLOAD_TOKEN}}
221211

222212
publish:
223213
if: >
@@ -239,11 +229,11 @@ jobs:
239229

240230
steps:
241231
- name: Download all artefacts
242-
uses: actions/download-artifact@v5
232+
uses: actions/download-artifact@v6
243233
with:
244234
path: dist # everything lands in ./dist/**
245235

246-
# TODO: This step can be probably be achieved by actions/download-artifact@v5
236+
# TODO: This step can be probably be achieved by actions/download-artifact@v6
247237
# by specifying merge-multiple: true, and a glob pattern
248238
- name: Collect files
249239
run: |

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
.noseids
2222
.ipynb_checkpoints
2323
.tags
24+
tags
2425
.cache/
2526
.vscode/
2627

@@ -66,7 +67,6 @@ pandas/py.typed
6667
.ropeproject
6768
# wheel files
6869
*.whl
69-
**/wheelhouse/*
7070
pip-wheel-metadata
7171
# coverage
7272
.coverage

0 commit comments

Comments
 (0)