Skip to content

Commit 10c6c8d

Browse files
authored
Merge branch 'main' into feature/add-typst-support-to-styler
2 parents 8f149ab + ea7ff0e commit 10c6c8d

File tree

89 files changed

+1545
-540
lines changed

Some content is hidden

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

89 files changed

+1545
-540
lines changed

.circleci/config.yml

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

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ pandas/_version.py export-subst
6161
*.pxi export-ignore
6262

6363
# Ignoring stuff from the top level
64-
.circleci export-ignore
6564
.github export-ignore
6665
asv_bench export-ignore
6766
ci export-ignore

.github/workflows/unit-tests.yml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ defaults:
2222

2323
jobs:
2424
ubuntu:
25-
runs-on: ubuntu-22.04
25+
runs-on: ${{ matrix.platform }}
2626
timeout-minutes: 90
2727
strategy:
2828
matrix:
29+
platform: [ubuntu-22.04, ubuntu-24.04-arm]
2930
env_file: [actions-310.yaml, actions-311.yaml, actions-312.yaml]
3031
# Prevent the include jobs from overriding other jobs
3132
pattern: [""]
@@ -35,9 +36,11 @@ jobs:
3536
env_file: actions-311-downstream_compat.yaml
3637
pattern: "not slow and not network and not single_cpu"
3738
pytest_target: "pandas/tests/test_downstream.py"
39+
platform: ubuntu-22.04
3840
- name: "Minimum Versions"
3941
env_file: actions-310-minimum_versions.yaml
4042
pattern: "not slow and not network and not single_cpu"
43+
platform: ubuntu-22.04
4144
- name: "Locale: it_IT"
4245
env_file: actions-311.yaml
4346
pattern: "not slow and not network and not single_cpu"
@@ -48,6 +51,7 @@ jobs:
4851
# Also install it_IT (its encoding is ISO8859-1) but do not activate it.
4952
# It will be temporarily activated during tests with locale.setlocale
5053
extra_loc: "it_IT"
54+
platform: ubuntu-22.04
5155
- name: "Locale: zh_CN"
5256
env_file: actions-311.yaml
5357
pattern: "not slow and not network and not single_cpu"
@@ -58,25 +62,32 @@ jobs:
5862
# Also install zh_CN (its encoding is gb2312) but do not activate it.
5963
# It will be temporarily activated during tests with locale.setlocale
6064
extra_loc: "zh_CN"
65+
platform: ubuntu-22.04
6166
- name: "Future infer strings"
6267
env_file: actions-312.yaml
6368
pandas_future_infer_string: "1"
69+
platform: ubuntu-22.04
6470
- name: "Future infer strings (without pyarrow)"
6571
env_file: actions-311.yaml
6672
pandas_future_infer_string: "1"
73+
platform: ubuntu-22.04
6774
- name: "Pypy"
6875
env_file: actions-pypy-39.yaml
6976
pattern: "not slow and not network and not single_cpu"
7077
test_args: "--max-worker-restart 0"
78+
platform: ubuntu-22.04
7179
- name: "Numpy Dev"
7280
env_file: actions-311-numpydev.yaml
7381
pattern: "not slow and not network and not single_cpu"
7482
test_args: "-W error::DeprecationWarning -W error::FutureWarning"
83+
platform: ubuntu-22.04
7584
- name: "Pyarrow Nightly"
7685
env_file: actions-311-pyarrownightly.yaml
7786
pattern: "not slow and not network and not single_cpu"
87+
pandas_future_infer_string: "1"
88+
platform: ubuntu-22.04
7889
fail-fast: false
79-
name: ${{ matrix.name || format('ubuntu-latest {0}', matrix.env_file) }}
90+
name: ${{ matrix.name || format('{0} {1}', matrix.platform, matrix.env_file) }}
8091
env:
8192
PATTERN: ${{ matrix.pattern }}
8293
LANG: ${{ matrix.lang || 'C.UTF-8' }}
@@ -91,7 +102,7 @@ jobs:
91102
REMOVE_PYARROW: ${{ matrix.name == 'Future infer strings (without pyarrow)' && '1' || '0' }}
92103
concurrency:
93104
# https://github.community/t/concurrecy-not-work-for-push/183068/7
94-
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }}-${{ matrix.pandas_future_infer_string }}
105+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }}-${{ matrix.pandas_future_infer_string }}-${{ matrix.platform }}
95106
cancel-in-progress: true
96107

97108
services:
@@ -419,20 +430,20 @@ jobs:
419430
with:
420431
fetch-depth: 0
421432

422-
- name: Set up Python for Pyodide
433+
- name: Set up Python for pyodide-build
423434
id: setup-python
424435
uses: actions/setup-python@v5
425436
with:
426-
python-version: '3.11.3'
437+
python-version: '3.12'
427438

428439
- name: Set up Emscripten toolchain
429440
uses: mymindstorm/setup-emsdk@v14
430441
with:
431-
version: '3.1.46'
442+
version: '3.1.58'
432443
actions-cache-folder: emsdk-cache
433444

434445
- name: Install pyodide-build
435-
run: pip install "pyodide-build==0.25.1"
446+
run: pip install "pyodide-build>=0.29.2"
436447

437448
- name: Build pandas for Pyodide
438449
run: |
@@ -441,10 +452,13 @@ jobs:
441452
- name: Set up Node.js
442453
uses: actions/setup-node@v4
443454
with:
444-
node-version: '18'
455+
node-version: '20'
445456

446457
- name: Set up Pyodide virtual environment
458+
env:
459+
pyodide-version: '0.27.1'
447460
run: |
461+
pyodide xbuildenv install ${{ env.pyodide-version }}
448462
pyodide venv .venv-pyodide
449463
source .venv-pyodide/bin/activate
450464
pip install dist/*.whl

.github/workflows/wheels.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ jobs:
9494
buildplat:
9595
- [ubuntu-22.04, manylinux_x86_64]
9696
- [ubuntu-22.04, musllinux_x86_64]
97+
- [ubuntu-24.04-arm, manylinux_aarch64]
9798
- [macos-13, macosx_x86_64]
9899
# Note: M1 images on Github Actions start from macOS 14
99100
- [macos-14, macosx_arm64]

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,7 @@ doc/source/savefig/
137137
# Interactive terminal generated files #
138138
########################################
139139
.jupyterlite.doit.db
140+
141+
# Pyodide/WASM related files #
142+
##############################
143+
/.pyodide-xbuildenv-*

ci/code_checks.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,9 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
7979
-i "pandas.Timestamp.min PR02" \
8080
-i "pandas.Timestamp.resolution PR02" \
8181
-i "pandas.Timestamp.tzinfo GL08" \
82-
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
83-
-i "pandas.arrays.TimedeltaArray PR07,SA01" \
8482
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
8583
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
8684
-i "pandas.core.resample.Resampler.quantile PR01,PR07" \
87-
-i "pandas.core.resample.Resampler.transform PR01,RT03,SA01" \
88-
-i "pandas.plotting.andrews_curves RT03,SA01" \
8985
-i "pandas.tseries.offsets.BDay PR02,SA01" \
9086
-i "pandas.tseries.offsets.BQuarterBegin.is_on_offset GL08" \
9187
-i "pandas.tseries.offsets.BQuarterBegin.n GL08" \
@@ -149,15 +145,13 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
149145
-i "pandas.tseries.offsets.CustomBusinessMonthBegin PR02" \
150146
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.calendar GL08" \
151147
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.holidays GL08" \
152-
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.is_on_offset SA01" \
153148
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.m_offset GL08" \
154149
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.n GL08" \
155150
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.normalize GL08" \
156151
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.weekmask GL08" \
157152
-i "pandas.tseries.offsets.CustomBusinessMonthEnd PR02" \
158153
-i "pandas.tseries.offsets.CustomBusinessMonthEnd.calendar GL08" \
159154
-i "pandas.tseries.offsets.CustomBusinessMonthEnd.holidays GL08" \
160-
-i "pandas.tseries.offsets.CustomBusinessMonthEnd.is_on_offset SA01" \
161155
-i "pandas.tseries.offsets.CustomBusinessMonthEnd.m_offset GL08" \
162156
-i "pandas.tseries.offsets.CustomBusinessMonthEnd.n GL08" \
163157
-i "pandas.tseries.offsets.CustomBusinessMonthEnd.normalize GL08" \
@@ -194,7 +188,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
194188
-i "pandas.tseries.offsets.Hour.is_on_offset GL08" \
195189
-i "pandas.tseries.offsets.Hour.n GL08" \
196190
-i "pandas.tseries.offsets.Hour.normalize GL08" \
197-
-i "pandas.tseries.offsets.LastWeekOfMonth SA01" \
198191
-i "pandas.tseries.offsets.LastWeekOfMonth.is_on_offset GL08" \
199192
-i "pandas.tseries.offsets.LastWeekOfMonth.n GL08" \
200193
-i "pandas.tseries.offsets.LastWeekOfMonth.normalize GL08" \

ci/deps/actions-311-pyarrownightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies:
2323

2424
- pip:
2525
- "tzdata>=2022.7"
26-
- "--extra-index-url https://pypi.fury.io/arrow-nightlies/"
26+
- "--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
2727
- "--prefer-binary"
2828
- "--pre"
2929
- "pyarrow"

0 commit comments

Comments
 (0)