Skip to content

Commit 642e3bc

Browse files
authored
Merge branch 'main' into enh_python_scalars
2 parents 6430b46 + f2ca056 commit 642e3bc

File tree

85 files changed

+1399
-1306
lines changed

Some content is hidden

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

85 files changed

+1399
-1306
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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@v5
96+
uses: actions/upload-artifact@v6
9797
with:
9898
name: website
9999
path: web/build

.github/workflows/wheels.yml

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && ( ! endsWith(github.ref, 'dev0')))
4646
runs-on: ubuntu-24.04
4747
env:
48-
IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
4948
IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
5049
outputs:
5150
sdist_file: ${{ steps.save-path.outputs.sdist_name }}
@@ -65,7 +64,7 @@ jobs:
6564
python -m pip install build
6665
python -m build --sdist
6766
68-
- uses: actions/upload-artifact@v5
67+
- uses: actions/upload-artifact@v6
6968
with:
7069
name: sdist
7170
path: ./dist/*
@@ -118,7 +117,6 @@ jobs:
118117
python: ["cp313t", "3.13"]
119118

120119
env:
121-
IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
122120
IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
123121
steps:
124122
- name: Checkout pandas
@@ -140,7 +138,7 @@ jobs:
140138
# removes unnecessary files from the release
141139
- name: Download sdist (not macOS)
142140
#if: ${{ matrix.buildplat[1] != 'macosx_*' }}
143-
uses: actions/download-artifact@v6
141+
uses: actions/download-artifact@v7
144142
with:
145143
name: sdist
146144
path: ./dist
@@ -166,6 +164,7 @@ jobs:
166164
uses: pypa/cibuildwheel@v3.2.1
167165
with:
168166
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
167+
output-dir: ./dist
169168
env:
170169
CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
171170
CIBW_BUILD_FRONTEND: ${{ matrix.cibw_build_frontend || 'pip' }}
@@ -196,29 +195,19 @@ jobs:
196195

197196
- name: Validate wheel RECORD
198197
shell: bash -el {0}
199-
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
200199

201-
- uses: actions/upload-artifact@v5
200+
- uses: actions/upload-artifact@v6
202201
with:
203202
name: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
204-
path: ./wheelhouse/*.whl
203+
path: ./dist/*.whl
205204

206205
- name: Upload wheels & sdist
207-
if: ${{ success() && (env.IS_SCHEDULE_DISPATCH == 'true' || env.IS_PUSH == 'true') }}
208-
shell: bash -el {0}
209-
env:
210-
PANDAS_STAGING_UPLOAD_TOKEN: ${{ secrets.PANDAS_STAGING_UPLOAD_TOKEN }}
211-
PANDAS_NIGHTLY_UPLOAD_TOKEN: ${{ secrets.PANDAS_NIGHTLY_UPLOAD_TOKEN }}
212-
# trigger an upload to
213-
# https://anaconda.org/scientific-python-nightly-wheels/pandas
214-
# for cron jobs or "Run workflow" (restricted to main branch).
215-
# Tags will upload to
216-
# https://anaconda.org/multibuild-wheels-staging/pandas
217-
# The tokens were originally generated at anaconda.org
218-
run: |
219-
source ci/upload_wheels.sh
220-
set_upload_vars
221-
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}}
222211

223212
publish:
224213
if: >
@@ -240,11 +229,11 @@ jobs:
240229

241230
steps:
242231
- name: Download all artefacts
243-
uses: actions/download-artifact@v6
232+
uses: actions/download-artifact@v7
244233
with:
245234
path: dist # everything lands in ./dist/**
246235

247-
# TODO: This step can be probably be achieved by actions/download-artifact@v6
236+
# TODO: This step can be probably be achieved by actions/download-artifact@v7
248237
# by specifying merge-multiple: true, and a glob pattern
249238
- name: Collect files
250239
run: |

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ pandas/py.typed
6767
.ropeproject
6868
# wheel files
6969
*.whl
70-
**/wheelhouse/*
7170
pip-wheel-metadata
7271
# coverage
7372
.coverage

ci/code_checks.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
6969
"$BASE_DIR"/scripts/validate_docstrings.py \
7070
--format=actions \
7171
-i ES01 `# For now it is ok if docstrings are missing the extended summary` \
72+
-i "pandas.DataFrame.from_arrow SA01,EX01" \
7273
-i "pandas.Series.dt PR01" `# Accessors are implemented as classes, but we do not document the Parameters section` \
7374
-i "pandas.Period.freq GL08" \
7475
-i "pandas.Period.ordinal GL08" \
@@ -78,6 +79,8 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
7879
-i "pandas.api.typing.DataFrameGroupBy.plot PR02" \
7980
-i "pandas.api.typing.SeriesGroupBy.plot PR02" \
8081
-i "pandas.api.typing.Resampler.quantile PR01,PR07" \
82+
-i "pandas.StringDtype.storage SA01" \
83+
-i "pandas.StringDtype.na_value SA01" \
8184
-i "pandas.tseries.offsets.BDay PR02,SA01" \
8285
-i "pandas.tseries.offsets.BHalfYearBegin.is_on_offset GL08" \
8386
-i "pandas.tseries.offsets.BHalfYearBegin.n GL08" \
@@ -165,6 +168,8 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
165168
-i "pandas.tseries.offsets.DateOffset.is_on_offset GL08" \
166169
-i "pandas.tseries.offsets.DateOffset.n GL08" \
167170
-i "pandas.tseries.offsets.DateOffset.normalize GL08" \
171+
-i "pandas.tseries.offsets.DateOffset.rollback SA01,EX01" \
172+
-i "pandas.tseries.offsets.DateOffset.rollforward SA01,EX01" \
168173
-i "pandas.tseries.offsets.Day.freqstr SA01" \
169174
-i "pandas.tseries.offsets.Day.is_on_offset GL08" \
170175
-i "pandas.tseries.offsets.Day.n GL08" \

ci/upload_wheels.sh

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

0 commit comments

Comments
 (0)