Skip to content

Commit e6aad53

Browse files
committed
Merge remote-tracking branch 'upstream/main' into 1542-Transformer-parse
2 parents e7c0054 + 9c37786 commit e6aad53

218 files changed

Lines changed: 30602 additions & 19373 deletions

File tree

Some content is hidden

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

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
run: |
1919
echo "PR_NUMBER=${{ github.event.pull_request.number }}" >> $GITHUB_ENV
2020
echo "TAGGED_MILESTONE=${{ github.event.pull_request.milestone.title }}" >> $GITHUB_ENV
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
with:
2323
fetch-depth: '0'
2424
- name: Check the changelog entry

.github/workflows/check_stub_files_diff.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v4
18-
- uses: prefix-dev/setup-pixi@v0.8.8
17+
- uses: actions/checkout@v5
18+
- uses: prefix-dev/setup-pixi@v0.9.2
1919
with:
2020
pixi-version: v0.41.3
2121
frozen: true
2222

23-
- name: Check stub file for `_expression.py` is up-to-date
23+
- name: Check stub file for `_data_ops.py` is up-to-date
2424
run: pixi run -e check-pyi-diff check

.github/workflows/run-code-format-checks.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v4
18-
- uses: prefix-dev/setup-pixi@v0.8.8
17+
- uses: actions/checkout@v5
18+
- uses: prefix-dev/setup-pixi@v0.9.2
1919
with:
2020
pixi-version: v0.41.3
2121
frozen: true

.github/workflows/test-javascript.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
test:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
16-
- uses: prefix-dev/setup-pixi@v0.8.8
15+
- uses: actions/checkout@v5
16+
- uses: prefix-dev/setup-pixi@v0.9.2
1717
with:
1818
pixi-version: v0.41.3
1919
environments: ci-py312-latest-optional-deps

.github/workflows/testing.yml

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,29 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [windows-latest, ubuntu-latest, macos-latest]
18-
environment: [
19-
ci-py309-min-deps,
20-
ci-py309-min-optional-deps,
21-
ci-py311-transformers,
22-
ci-py313-latest-deps,
23-
ci-py313-latest-optional-deps
24-
]
18+
environment:
19+
- ci-py309-min-deps
20+
- ci-py309-min-optional-deps
21+
- ci-py311-transformers
22+
- ci-py313-latest-deps
23+
- ci-py313-latest-optional-deps
24+
- ci-py313-polars-without-pyarrow
2525
runs-on: ${{ matrix.os }}
2626
steps:
27-
- uses: actions/checkout@v4
28-
- uses: prefix-dev/setup-pixi@v0.8.8
27+
- uses: actions/checkout@v5
28+
- uses: prefix-dev/setup-pixi@v0.9.2
2929
with:
3030
pixi-version: v0.41.3
3131
environments: ${{ matrix.environment }}
3232
# we can freeze the environment and manually bump the dependencies to the
3333
# latest version time to time.
3434
frozen: true
35-
3635
- name: Run tests
3736
run: pixi run -e ${{ matrix.environment }} test -n auto
38-
3937
- name: Run user guide doctests
4038
run: pixi run -e ${{ matrix.environment }} test-user-guide
41-
4239
- name: Upload coverage reports to Codecov
43-
uses: codecov/codecov-action@v5.4.3
40+
uses: codecov/codecov-action@v5.5.1
4441
with:
4542
token: ${{ secrets.CODECOV_TOKEN }}
4643
slug: skrub-data/skrub
@@ -50,32 +47,25 @@ jobs:
5047
outputs:
5148
run: ${{ github.event_name == 'schedule' || contains(steps.get_head_commit_message.outputs.COMMIT_MSG, '[deps nightly]') }}
5249
steps:
53-
- uses: actions/checkout@v4
50+
- uses: actions/checkout@v5
5451
with:
5552
ref: ${{ github.event.pull_request.head.sha }}
5653
- id: get_head_commit_message
57-
name: get head commit message
54+
name: Get head commit message
5855
run: echo "COMMIT_MSG=$(git show -s --format=%s)" >> "$GITHUB_OUTPUT"
5956

6057
test_against_nightly:
6158
needs: check_run_nightly
6259
if: ${{ needs.check_run_nightly.outputs.run == 'true' }}
6360
runs-on: ubuntu-latest
64-
name: test against nighlty dependencies
61+
name: Test against nightly dependencies
6562
steps:
66-
- uses: actions/checkout@v4
67-
- uses: actions/setup-python@v5
63+
- uses: actions/checkout@v5
64+
- uses: prefix-dev/setup-pixi@v0.9.2
6865
with:
69-
python-version: "3.11"
70-
name: 'Setup python'
71-
- shell: bash {0}
72-
run: |
73-
dev_anaconda_url=https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
74-
pip install --pre --upgrade --timeout=60 --extra-index $dev_anaconda_url .
75-
dev_arrow=https://pypi.fury.io/arrow-nightlies/
76-
pip install --extra-index-url $dev_arrow --prefer-binary --pre .[optional]
77-
pip install .[test]
78-
name: 'Install skrub and nightly dependencies'
79-
- shell: bash {0}
80-
run: pytest -vsl --cov=skrub --cov-report=xml skrub -n 3
81-
name: 'Run tests'
66+
pixi-version: v0.41.3
67+
# we can freeze the environment and manually bump the dependencies to the
68+
# latest version time to time.
69+
frozen: true
70+
- name: Run tests
71+
run: pixi run --environment ci-nightly-deps pytest -vsl --cov=skrub --cov-report=xml skrub -n 3

.github/workflows/update_pixi_lock_files.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
fail-fast: false
2222

2323
steps:
24-
- uses: actions/checkout@v4
25-
- uses: prefix-dev/setup-pixi@v0.8.8
24+
- uses: actions/checkout@v5
25+
- uses: prefix-dev/setup-pixi@v0.9.2
2626
with:
2727
pixi-version: v0.41.3
2828

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.3.0
3+
rev: v6.0.0
44
hooks:
55
- id: check-yaml
66
- id: end-of-file-fixer

0 commit comments

Comments
 (0)