Skip to content

Commit 2999ebb

Browse files
authored
Merge branch 'main' into arrow-to-csv
2 parents ba451e1 + 82449b9 commit 2999ebb

File tree

738 files changed

+14516
-10644
lines changed

Some content is hidden

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

738 files changed

+14516
-10644
lines changed

.circleci/config.yml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,29 @@ jobs:
1818
PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH
1919
LD_PRELOAD=$HOME/miniconda3/envs/pandas-dev/lib/libgomp.so.1:$LD_PRELOAD
2020
ci/run_tests.sh
21+
linux-musl:
22+
docker:
23+
- image: quay.io/pypa/musllinux_1_1_aarch64
24+
resource_class: arm.large
25+
steps:
26+
# Install pkgs first to have git in the image
27+
# (needed for checkout)
28+
- run: |
29+
apk update
30+
apk add git
31+
apk add musl-locales
32+
- checkout
33+
- run: |
34+
/opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
35+
. ~/virtualenvs/pandas-dev/bin/activate
36+
python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
37+
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1
38+
python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
39+
python -m pip list --no-cache-dir
40+
- run: |
41+
. ~/virtualenvs/pandas-dev/bin/activate
42+
export PANDAS_CI=1
43+
python -m pytest -m 'not slow and not network and not clipboard and not single_cpu' pandas --junitxml=test-data.xml
2144
build-aarch64:
2245
parameters:
2346
cibw-build:
@@ -89,6 +112,13 @@ workflows:
89112
equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
90113
jobs:
91114
- test-arm
115+
test-musl:
116+
# Don't run trigger this one when scheduled pipeline runs
117+
when:
118+
not:
119+
equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
120+
jobs:
121+
- linux-musl
92122
build-wheels:
93123
jobs:
94124
- build-aarch64:
@@ -97,4 +127,11 @@ workflows:
97127
only: /^v.*/
98128
matrix:
99129
parameters:
100-
cibw-build: ["cp39-manylinux_aarch64", "cp310-manylinux_aarch64", "cp311-manylinux_aarch64", "cp312-manylinux_aarch64"]
130+
cibw-build: ["cp39-manylinux_aarch64",
131+
"cp310-manylinux_aarch64",
132+
"cp311-manylinux_aarch64",
133+
"cp312-manylinux_aarch64",
134+
"cp39-musllinux_aarch64",
135+
"cp310-musllinux_aarch64",
136+
"cp311-musllinux_aarch64",
137+
"cp312-musllinux_aarch64",]

.github/actions/build_pandas/action.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ inputs:
44
editable:
55
description: Whether to build pandas in editable mode (default true)
66
default: true
7+
meson_args:
8+
description: Extra flags to pass to meson
9+
required: false
10+
cflags_adds:
11+
description: Items to append to the CFLAGS variable
12+
required: false
713
runs:
814
using: composite
915
steps:
@@ -24,11 +30,12 @@ runs:
2430

2531
- name: Build Pandas
2632
run: |
33+
export CFLAGS="$CFLAGS ${{ inputs.cflags_adds }}"
2734
if [[ ${{ inputs.editable }} == "true" ]]; then
28-
pip install -e . --no-build-isolation -v --no-deps \
35+
pip install -e . --no-build-isolation -v --no-deps ${{ inputs.meson_args }} \
2936
--config-settings=setup-args="--werror"
3037
else
31-
pip install . --no-build-isolation -v --no-deps \
38+
pip install . --no-build-isolation -v --no-deps ${{ inputs.meson_args }} \
3239
--config-settings=setup-args="--werror"
3340
fi
3441
shell: bash -el {0}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
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
29
runs:
310
using: composite
411
steps:
512
- name: Test
6-
run: ci/run_tests.sh
13+
run: ${{ inputs.asan_options }} ${{ inputs.preload }} ci/run_tests.sh
714
shell: bash -el {0}
815

916
- name: Publish test results

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ runs:
1111
with:
1212
environment-file: ${{ inputs.environment-file }}
1313
environment-name: test
14-
condarc-file: ci/condarc.yml
14+
condarc-file: ci/.condarc
1515
cache-environment: true
1616
cache-downloads: true

.github/workflows/broken-linkcheck.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
- "doc/make.py"
1010
jobs:
1111
linkcheck:
12+
if: false
1213
runs-on: ubuntu-latest
1314
defaults:
1415
run:

.github/workflows/code-checks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.1.x
7+
- 2.2.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.1.x
11+
- 2.2.x
1212

1313
env:
1414
ENV_FILE: environment.yml
@@ -170,7 +170,7 @@ jobs:
170170

171171
- name: Setup Python
172172
id: setup_python
173-
uses: actions/setup-python@v4
173+
uses: actions/setup-python@v5
174174
with:
175175
python-version: '3.10'
176176
cache: 'pip'

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828

2929
steps:
3030
- uses: actions/checkout@v4
31-
- uses: github/codeql-action/init@v2
31+
- uses: github/codeql-action/init@v3
3232
with:
3333
languages: ${{ matrix.language }}
34-
- uses: github/codeql-action/autobuild@v2
35-
- uses: github/codeql-action/analyze@v2
34+
- uses: github/codeql-action/autobuild@v3
35+
- uses: github/codeql-action/analyze@v3

.github/workflows/deprecation-tracking-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
issues: write
2020
runs-on: ubuntu-22.04
2121
env:
22-
DEPRECATION_TRACKER_ISSUE: 50578
22+
DEPRECATION_TRACKER_ISSUE: 56596
2323
steps:
2424
- uses: actions/github-script@v7
2525
id: update-deprecation-issue

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.1.x
7+
- 2.2.x
88
tags:
99
- '*'
1010
pull_request:
1111
branches:
1212
- main
13-
- 2.1.x
13+
- 2.2.x
1414

1515
env:
1616
ENV_FILE: environment.yml
@@ -46,6 +46,9 @@ jobs:
4646
- name: Build Pandas
4747
uses: ./.github/actions/build_pandas
4848

49+
- name: Test website
50+
run: python -m pytest web/
51+
4952
- name: Build website
5053
run: python web/pandas_web.py web/pandas --target-path=web/build
5154

@@ -82,7 +85,7 @@ jobs:
8285
run: mv doc/build/html web/build/docs
8386

8487
- name: Save website as an artifact
85-
uses: actions/upload-artifact@v3
88+
uses: actions/upload-artifact@v4
8689
with:
8790
name: website
8891
path: web/build

.github/workflows/package-checks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.1.x
7+
- 2.2.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.1.x
11+
- 2.2.x
1212
types: [ labeled, opened, synchronize, reopened ]
1313

1414
permissions:
@@ -40,7 +40,7 @@ jobs:
4040

4141
- name: Setup Python
4242
id: setup_python
43-
uses: actions/setup-python@v4
43+
uses: actions/setup-python@v5
4444
with:
4545
python-version: '3.10'
4646

0 commit comments

Comments
 (0)