Skip to content

Commit d52a151

Browse files
jbrockmendeljbrockmendel
committed
Merge branch 'main' into depr-stata-infer
2 parents b379d54 + 6c55f5e commit d52a151

File tree

1,150 files changed

+41930
-49683
lines changed

Some content is hidden

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

1,150 files changed

+41930
-49683
lines changed

‎.circleci/config.yml

Lines changed: 40 additions & 7 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
@@ -18,12 +18,35 @@ 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:
2447
type: string
2548
machine:
26-
image: ubuntu-2004:2022.04.1
49+
image: default
2750
resource_class: arm.large
2851
environment:
2952
TRIGGER_SOURCE: << pipeline.trigger_source >>
@@ -49,10 +72,6 @@ jobs:
4972
no_output_timeout: 30m # Sometimes the tests won't generate any output, make sure the job doesn't get killed by that
5073
command: |
5174
pip3 install cibuildwheel==2.15.0
52-
# When this is a nightly wheel build, allow picking up NumPy 2.0 dev wheels:
53-
if [[ "$IS_SCHEDULE_DISPATCH" == "true" || "$IS_PUSH" != 'true' ]]; then
54-
export CIBW_ENVIRONMENT="PIP_EXTRA_INDEX_URL=https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
55-
fi
5675
cibuildwheel --prerelease-pythons --output-dir wheelhouse
5776
5877
environment:
@@ -89,6 +108,13 @@ workflows:
89108
equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
90109
jobs:
91110
- test-arm
111+
test-musl:
112+
# Don't run trigger this one when scheduled pipeline runs
113+
when:
114+
not:
115+
equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
116+
jobs:
117+
- linux-musl
92118
build-wheels:
93119
jobs:
94120
- build-aarch64:
@@ -97,4 +123,11 @@ workflows:
97123
only: /^v.*/
98124
matrix:
99125
parameters:
100-
cibw-build: ["cp39-manylinux_aarch64", "cp310-manylinux_aarch64", "cp311-manylinux_aarch64", "cp312-manylinux_aarch64"]
126+
cibw-build: ["cp39-manylinux_aarch64",
127+
"cp310-manylinux_aarch64",
128+
"cp311-manylinux_aarch64",
129+
"cp312-manylinux_aarch64",
130+
"cp39-musllinux_aarch64",
131+
"cp310-musllinux_aarch64",
132+
"cp311-musllinux_aarch64",
133+
"cp312-musllinux_aarch64",]

‎.github/ISSUE_TEMPLATE/pdep_vote.yaml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: PDEP Vote
2+
description: Call for a vote on a PDEP
3+
title: "VOTE: "
4+
labels: [Vote]
5+
6+
body:
7+
- type: markdown
8+
attributes:
9+
value: >
10+
As per [PDEP-1](https://pandas.pydata.org/pdeps/0001-purpose-and-guidelines.html), the following issue template should be used when a
11+
maintainer has opened a PDEP discussion and is ready to call for a vote.
12+
- type: checkboxes
13+
attributes:
14+
label: Locked issue
15+
options:
16+
- label: >
17+
I locked this voting issue so that only voting members are able to cast their votes or
18+
comment on this issue.
19+
required: true
20+
- type: input
21+
id: PDEP-name
22+
attributes:
23+
label: PDEP number and title
24+
placeholder: >
25+
PDEP-1: Purpose and guidelines
26+
validations:
27+
required: true
28+
- type: input
29+
id: PDEP-link
30+
attributes:
31+
label: Pull request with discussion
32+
description: e.g. https://github.com/pandas-dev/pandas/pull/47444
33+
validations:
34+
required: true
35+
- type: input
36+
id: PDEP-rendered-link
37+
attributes:
38+
label: Rendered PDEP for easy reading
39+
description: e.g. https://github.com/pandas-dev/pandas/pull/47444/files?short_path=7c449e6#diff-7c449e698132205b235c501f7e47ebba38da4d2b7f9492c98f16745dba787041
40+
validations:
41+
required: true
42+
- type: input
43+
id: PDEP-number-of-discussion-participants
44+
attributes:
45+
label: Discussion participants
46+
description: >
47+
You may find it useful to list or total the number of participating members in the
48+
PDEP discussion PR. This would be the maximum possible disapprove votes.
49+
placeholder: >
50+
14 voting members participated in the PR discussion thus far.
51+
- type: input
52+
id: PDEP-vote-end
53+
attributes:
54+
label: Voting will close in 15 days.
55+
description: The voting period end date. ('Voting will close in 15 days.' will be automatically written)
56+
- type: markdown
57+
attributes:
58+
value: ---
59+
- type: textarea
60+
id: Vote
61+
attributes:
62+
label: Vote
63+
value: |
64+
Cast your vote in a comment below.
65+
* +1: approve.
66+
* 0: abstain.
67+
* Reason: A one sentence reason is required.
68+
* -1: disapprove
69+
* Reason: A one sentence reason is required.
70+
A disapprove vote requires prior participation in the linked discussion PR.
71+
72+
@pandas-dev/pandas-core
73+
validations:
74+
required: true

‎.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: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ runs:
1313
path: test-data.xml
1414
if: failure()
1515

16-
- name: Report Coverage
17-
run: coverage report -m
18-
shell: bash -el {0}
19-
if: failure()
20-
2116
- name: Upload coverage to Codecov
2217
uses: codecov/codecov-action@v3
2318
with:

‎.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/cache-cleanup-weekly.yml renamed to ‎.github/workflows/cache-cleanup-daily.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Purge caches once a week
1+
name: Purge caches daily
22
on:
33
schedule:
4-
# 4:10 UTC on Sunday
5-
- cron: "10 4 * * 0"
4+
# 4:10 UTC daily
5+
- cron: "10 4 * * *"
66

77
jobs:
88
cleanup:

‎.github/workflows/code-checks.yml

Lines changed: 4 additions & 4 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
@@ -85,8 +85,8 @@ jobs:
8585
echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV
8686
if: ${{ steps.build.outcome == 'success' && always() }}
8787

88-
- name: Typing + pylint
89-
uses: pre-commit/[email protected].0
88+
- name: Typing
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/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/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/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

0 commit comments

Comments
 (0)