Skip to content

Commit 4dc3bea

Browse files
Merge branch 'main' into test_numpy_complex2
2 parents 89ea60b + 41383cf commit 4dc3bea

File tree

853 files changed

+20166
-31949
lines changed

Some content is hidden

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

853 files changed

+20166
-31949
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
jobs:
44
test-arm:
55
machine:
6-
image: ubuntu-2004:2022.04.1
6+
image: default
77
resource_class: arm.large
88
environment:
99
ENV_FILE: ci/deps/circle-310-arm64.yaml
@@ -46,7 +46,7 @@ jobs:
4646
cibw-build:
4747
type: string
4848
machine:
49-
image: ubuntu-2004:2022.04.1
49+
image: default
5050
resource_class: arm.large
5151
environment:
5252
TRIGGER_SOURCE: << pipeline.trigger_source >>

.github/actions/run-tests/action.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
name: Run tests and report results
2-
inputs:
3-
preload:
4-
description: Preload arguments for sanitizer
5-
required: false
6-
asan_options:
7-
description: Arguments for Address Sanitizer (ASAN)
8-
required: false
92
runs:
103
using: composite
114
steps:
125
- name: Test
13-
run: ${{ inputs.asan_options }} ${{ inputs.preload }} ci/run_tests.sh
6+
run: ci/run_tests.sh
147
shell: bash -el {0}
158

169
- name: Publish test results
@@ -20,11 +13,6 @@ runs:
2013
path: test-data.xml
2114
if: failure()
2215

23-
- name: Report Coverage
24-
run: coverage report -m
25-
shell: bash -el {0}
26-
if: failure()
27-
2816
- name: Upload coverage to Codecov
2917
uses: codecov/codecov-action@v3
3018
with:

.github/workflows/code-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
if: ${{ steps.build.outcome == 'success' && always() }}
8787

8888
- name: Typing + pylint
89-
uses: pre-commit/[email protected].0
89+
uses: pre-commit/[email protected].1
9090
with:
9191
extra_args: --verbose --hook-stage manual --all-files
9292
if: ${{ steps.build.outcome == 'success' && always() }}

.github/workflows/comment-commands.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ jobs:
2424
concurrency:
2525
group: ${{ github.actor }}-preview-docs
2626
steps:
27-
- run: |
28-
if curl --output /dev/null --silent --head --fail "https://pandas.pydata.org/preview/${{ github.event.issue.number }}/"; then
29-
curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -d '{"body": "Website preview of this PR available at: https://pandas.pydata.org/preview/${{ github.event.issue.number }}/"}' https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/comments
30-
else
31-
curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -d '{"body": "No preview found for PR #${{ github.event.issue.number }}. Did the docs build complete?"}' https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/comments
32-
fi
27+
- uses: pandas-dev/[email protected]
28+
with:
29+
previewer-server: "https://pandas.pydata.org/preview"
30+
artifact-job: "Doc Build and Upload"
3331
asv_run:
3432
runs-on: ubuntu-22.04
3533
# TODO: Support more benchmarking options later, against different branches, against self, etc

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,3 @@ jobs:
9090
name: website
9191
path: web/build
9292
retention-days: 14
93-
94-
- name: Trigger web/doc preview
95-
run: curl -X POST https://pandas.pydata.org/preview/submit/$RUN_ID/$PR_ID/
96-
env:
97-
RUN_ID: ${{ github.run_id }}
98-
PR_ID: ${{ github.event.pull_request.number }}
99-
if: github.event_name == 'pull_request'

.github/workflows/package-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-22.04
2525
strategy:
2626
matrix:
27-
extra: ["test", "performance", "computation", "fss", "aws", "gcp", "excel", "parquet", "feather", "hdf5", "spss", "postgresql", "mysql", "sql-other", "html", "xml", "plot", "output-formatting", "clipboard", "compression", "consortium-standard", "all"]
27+
extra: ["test", "pyarrow", "performance", "computation", "fss", "aws", "gcp", "excel", "parquet", "feather", "hdf5", "spss", "postgresql", "mysql", "sql-other", "html", "xml", "plot", "output-formatting", "clipboard", "compression", "all"]
2828
fail-fast: false
2929
name: Install Extras - ${{ matrix.extra }}
3030
concurrency:

.github/workflows/unit-tests.yml

Lines changed: 7 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -57,63 +57,23 @@ jobs:
5757
# Also install zh_CN (its encoding is gb2312) but do not activate it.
5858
# It will be temporarily activated during tests with locale.setlocale
5959
extra_loc: "zh_CN"
60-
- name: "Copy-on-Write 3.9"
61-
env_file: actions-39.yaml
62-
pattern: "not slow and not network and not single_cpu"
63-
pandas_copy_on_write: "1"
64-
- name: "Copy-on-Write 3.10"
65-
env_file: actions-310.yaml
66-
pattern: "not slow and not network and not single_cpu"
67-
pandas_copy_on_write: "1"
68-
- name: "Copy-on-Write 3.11"
69-
env_file: actions-311.yaml
70-
pattern: "not slow and not network and not single_cpu"
71-
pandas_copy_on_write: "1"
72-
- name: "Copy-on-Write 3.12"
73-
env_file: actions-312.yaml
74-
pattern: "not slow and not network and not single_cpu"
75-
pandas_copy_on_write: "1"
76-
- name: "Copy-on-Write 3.11 (warnings)"
77-
env_file: actions-311.yaml
78-
pattern: "not slow and not network and not single_cpu"
79-
pandas_copy_on_write: "warn"
80-
- name: "Copy-on-Write 3.10 (warnings)"
81-
env_file: actions-310.yaml
82-
pattern: "not slow and not network and not single_cpu"
83-
pandas_copy_on_write: "warn"
84-
- name: "Copy-on-Write 3.9 (warnings)"
85-
env_file: actions-39.yaml
86-
pattern: "not slow and not network and not single_cpu"
87-
pandas_copy_on_write: "warn"
8860
- name: "Pypy"
8961
env_file: actions-pypy-39.yaml
9062
pattern: "not slow and not network and not single_cpu"
9163
test_args: "--max-worker-restart 0"
9264
- name: "Numpy Dev"
9365
env_file: actions-311-numpydev.yaml
9466
pattern: "not slow and not network and not single_cpu"
95-
# Currently restricted the warnings that error to Deprecation Warnings from numpy
96-
# done since pyarrow isn't compatible with numpydev always
97-
# TODO: work with pyarrow to revert this?
98-
test_args: "-W error::DeprecationWarning:numpy -W error::FutureWarning:numpy"
67+
test_args: "-W error::DeprecationWarning -W error::FutureWarning"
9968
- name: "Pyarrow Nightly"
10069
env_file: actions-311-pyarrownightly.yaml
10170
pattern: "not slow and not network and not single_cpu"
102-
- name: "ASAN / UBSAN"
103-
env_file: actions-311-sanitizers.yaml
104-
pattern: "not slow and not network and not single_cpu and not skip_ubsan"
105-
asan_options: "ASAN_OPTIONS=detect_leaks=0"
106-
preload: LD_PRELOAD=$(gcc -print-file-name=libasan.so)
107-
meson_args: --config-settings=setup-args="-Db_sanitize=address,undefined"
108-
cflags_adds: -fno-sanitize-recover=all
109-
pytest_workers: -1 # disable pytest-xdist as it swallows stderr from ASAN
11071
fail-fast: false
11172
name: ${{ matrix.name || format('ubuntu-latest {0}', matrix.env_file) }}
11273
env:
11374
PATTERN: ${{ matrix.pattern }}
11475
LANG: ${{ matrix.lang || 'C.UTF-8' }}
11576
LC_ALL: ${{ matrix.lc_all || '' }}
116-
PANDAS_COPY_ON_WRITE: ${{ matrix.pandas_copy_on_write || '0' }}
11777
PANDAS_CI: ${{ matrix.pandas_ci || '1' }}
11878
TEST_ARGS: ${{ matrix.test_args || '' }}
11979
PYTEST_WORKERS: ${{ matrix.pytest_workers || 'auto' }}
@@ -123,7 +83,7 @@ jobs:
12383
QT_QPA_PLATFORM: offscreen
12484
concurrency:
12585
# https://github.community/t/concurrecy-not-work-for-push/183068/7
126-
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }}-${{ matrix.pandas_copy_on_write || '' }}
86+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }}}
12787
cancel-in-progress: true
12888

12989
services:
@@ -193,18 +153,12 @@ jobs:
193153
- name: Test (not single_cpu)
194154
uses: ./.github/actions/run-tests
195155
if: ${{ matrix.name != 'Pypy' }}
196-
with:
197-
preload: ${{ matrix.preload }}
198-
asan_options: ${{ matrix.asan_options }}
199156
env:
200157
# Set pattern to not single_cpu if not already set
201158
PATTERN: ${{ env.PATTERN == '' && 'not single_cpu' || matrix.pattern }}
202159

203160
- name: Test (single_cpu)
204161
uses: ./.github/actions/run-tests
205-
with:
206-
preload: ${{ matrix.preload }}
207-
asan_options: ${{ matrix.asan_options }}
208162
env:
209163
PATTERN: 'single_cpu'
210164
PYTEST_WORKERS: 0
@@ -214,7 +168,8 @@ jobs:
214168
timeout-minutes: 90
215169
strategy:
216170
matrix:
217-
os: [macos-latest, windows-latest]
171+
# Note: Don't use macOS latest since macos 14 appears to be arm64 only
172+
os: [macos-13, macos-14, windows-latest]
218173
env_file: [actions-39.yaml, actions-310.yaml, actions-311.yaml, actions-312.yaml]
219174
fail-fast: false
220175
runs-on: ${{ matrix.os }}
@@ -227,8 +182,7 @@ jobs:
227182
PANDAS_CI: 1
228183
PYTEST_TARGET: pandas
229184
PATTERN: "not slow and not db and not network and not single_cpu"
230-
# GH 47443: PYTEST_WORKERS > 0 crashes Windows builds with memory related errors
231-
PYTEST_WORKERS: ${{ matrix.os == 'macos-latest' && 'auto' || '0' }}
185+
PYTEST_WORKERS: 'auto'
232186

233187
steps:
234188
- name: Checkout
@@ -354,7 +308,8 @@ jobs:
354308
strategy:
355309
fail-fast: false
356310
matrix:
357-
os: [ubuntu-22.04, macOS-latest, windows-latest]
311+
# Separate out macOS 13 and 14, since macOS 14 is arm64 only
312+
os: [ubuntu-22.04, macOS-13, macOS-14, windows-latest]
358313

359314
timeout-minutes: 90
360315

.github/workflows/wheels.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ jobs:
9494
buildplat:
9595
- [ubuntu-22.04, manylinux_x86_64]
9696
- [ubuntu-22.04, musllinux_x86_64]
97-
- [macos-12, macosx_*]
97+
- [macos-12, macosx_x86_64]
98+
# Note: M1 images on Github Actions start from macOS 14
99+
- [macos-14, macosx_arm64]
98100
- [windows-2022, win_amd64]
99101
# TODO: support PyPy?
100102
python: [["cp39", "3.9"], ["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"]]
@@ -128,7 +130,7 @@ jobs:
128130
# Python version used to build sdist doesn't matter
129131
# wheel will be built from sdist with the correct version
130132
- name: Unzip sdist (macOS)
131-
if: ${{ matrix.buildplat[1] == 'macosx_*' }}
133+
if: ${{ startsWith(matrix.buildplat[1], 'macosx') }}
132134
run: |
133135
tar -xzf ./dist/${{ env.sdist_name }} -C ./dist
134136
@@ -139,18 +141,18 @@ jobs:
139141

140142
- name: Build normal wheels
141143
if: ${{ (env.IS_SCHEDULE_DISPATCH != 'true' || env.IS_PUSH == 'true') }}
142-
uses: pypa/cibuildwheel@v2.16.2
144+
uses: pypa/cibuildwheel@v2.17.0
143145
with:
144-
package-dir: ./dist/${{ matrix.buildplat[1] == 'macosx_*' && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
146+
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
145147
env:
146148
CIBW_PRERELEASE_PYTHONS: True
147149
CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
148150

149151
- name: Build nightly wheels (with NumPy pre-release)
150152
if: ${{ (env.IS_SCHEDULE_DISPATCH == 'true' && env.IS_PUSH != 'true') }}
151-
uses: pypa/cibuildwheel@v2.16.2
153+
uses: pypa/cibuildwheel@v2.17.0
152154
with:
153-
package-dir: ./dist/${{ matrix.buildplat[1] == 'macosx_*' && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
155+
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
154156
env:
155157
# The nightly wheels should be build witht he NumPy 2.0 pre-releases
156158
# which requires the additional URL.
@@ -183,15 +185,15 @@ jobs:
183185
$TST_CMD = @"
184186
python -m pip install hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0;
185187
python -m pip install `$(Get-Item pandas\wheelhouse\*.whl);
186-
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`\"\"])`';
188+
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`\"])`';
187189
"@
188190
# add rc to the end of the image name if the Python version is unreleased
189191
docker pull python:${{ matrix.python[1] == '3.12' && '3.12-rc' || format('{0}-windowsservercore', matrix.python[1]) }}
190192
docker run --env PANDAS_CI='1' -v ${PWD}:C:\pandas python:${{ matrix.python[1] == '3.12' && '3.12-rc' || format('{0}-windowsservercore', matrix.python[1]) }} powershell -Command $TST_CMD
191193
192194
- uses: actions/upload-artifact@v4
193195
with:
194-
name: ${{ matrix.python[0] }}-${{ startsWith(matrix.buildplat[1], 'macosx') && 'macosx' || matrix.buildplat[1] }}
196+
name: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
195197
path: ./wheelhouse/*.whl
196198

197199
- name: Upload wheels & sdist

0 commit comments

Comments
 (0)