Skip to content

Commit ee2488a

Browse files
authored
Merge branch 'main' into Test_issue_57930
2 parents 1b8da24 + ea7ff0e commit ee2488a

Some content is hidden

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

49 files changed

+570
-395
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: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -430,20 +430,20 @@ jobs:
430430
with:
431431
fetch-depth: 0
432432

433-
- name: Set up Python for Pyodide
433+
- name: Set up Python for pyodide-build
434434
id: setup-python
435435
uses: actions/setup-python@v5
436436
with:
437-
python-version: '3.11.3'
437+
python-version: '3.12'
438438

439439
- name: Set up Emscripten toolchain
440440
uses: mymindstorm/setup-emsdk@v14
441441
with:
442-
version: '3.1.46'
442+
version: '3.1.58'
443443
actions-cache-folder: emsdk-cache
444444

445445
- name: Install pyodide-build
446-
run: pip install "pyodide-build==0.25.1"
446+
run: pip install "pyodide-build>=0.29.2"
447447

448448
- name: Build pandas for Pyodide
449449
run: |
@@ -452,10 +452,13 @@ jobs:
452452
- name: Set up Node.js
453453
uses: actions/setup-node@v4
454454
with:
455-
node-version: '18'
455+
node-version: '20'
456456

457457
- name: Set up Pyodide virtual environment
458+
env:
459+
pyodide-version: '0.27.1'
458460
run: |
461+
pyodide xbuildenv install ${{ env.pyodide-version }}
459462
pyodide venv .venv-pyodide
460463
source .venv-pyodide/bin/activate
461464
pip install dist/*.whl

.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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +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.TimedeltaArray PR07,SA01" \
8382
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
8483
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
8584
-i "pandas.core.resample.Resampler.quantile PR01,PR07" \
86-
-i "pandas.core.resample.Resampler.transform PR01,RT03,SA01" \
87-
-i "pandas.plotting.andrews_curves RT03,SA01" \
8885
-i "pandas.tseries.offsets.BDay PR02,SA01" \
8986
-i "pandas.tseries.offsets.BQuarterBegin.is_on_offset GL08" \
9087
-i "pandas.tseries.offsets.BQuarterBegin.n GL08" \
@@ -148,15 +145,13 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
148145
-i "pandas.tseries.offsets.CustomBusinessMonthBegin PR02" \
149146
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.calendar GL08" \
150147
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.holidays GL08" \
151-
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.is_on_offset SA01" \
152148
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.m_offset GL08" \
153149
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.n GL08" \
154150
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.normalize GL08" \
155151
-i "pandas.tseries.offsets.CustomBusinessMonthBegin.weekmask GL08" \
156152
-i "pandas.tseries.offsets.CustomBusinessMonthEnd PR02" \
157153
-i "pandas.tseries.offsets.CustomBusinessMonthEnd.calendar GL08" \
158154
-i "pandas.tseries.offsets.CustomBusinessMonthEnd.holidays GL08" \
159-
-i "pandas.tseries.offsets.CustomBusinessMonthEnd.is_on_offset SA01" \
160155
-i "pandas.tseries.offsets.CustomBusinessMonthEnd.m_offset GL08" \
161156
-i "pandas.tseries.offsets.CustomBusinessMonthEnd.n GL08" \
162157
-i "pandas.tseries.offsets.CustomBusinessMonthEnd.normalize GL08" \
@@ -193,7 +188,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
193188
-i "pandas.tseries.offsets.Hour.is_on_offset GL08" \
194189
-i "pandas.tseries.offsets.Hour.n GL08" \
195190
-i "pandas.tseries.offsets.Hour.normalize GL08" \
196-
-i "pandas.tseries.offsets.LastWeekOfMonth SA01" \
197191
-i "pandas.tseries.offsets.LastWeekOfMonth.is_on_offset GL08" \
198192
-i "pandas.tseries.offsets.LastWeekOfMonth.n GL08" \
199193
-i "pandas.tseries.offsets.LastWeekOfMonth.normalize GL08" \

ci/deps/circle-311-arm64.yaml

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

0 commit comments

Comments
 (0)