Skip to content

Commit 458e876

Browse files
erikvansebilleerikvansebille
committed
Merge branch 'v4-dev' into Interpolator_updates
2 parents 5944af3 + bba37f4 commit 458e876

File tree

99 files changed

+1539
-1424
lines changed

Some content is hidden

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

99 files changed

+1539
-1424
lines changed

‎.github/workflows/additional.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
shell: bash -l {0}
1414

1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717
- name: Setup micromamba
1818
uses: mamba-org/setup-micromamba@v2
1919
with:
@@ -36,7 +36,7 @@ jobs:
3636
shell: bash -l {0}
3737

3838
steps:
39-
- uses: actions/checkout@v4
40-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v5
40+
- uses: actions/checkout@v5
4141
- uses: prefix-dev/[email protected]
4242
- run: pixi run docs-linkcheck

‎.github/workflows/cache-pixi-lock.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
path: |
3131
pixi.lock
32-
key: ${{ steps.date.outputs.date }}_${{hashFiles('pixi.toml')}}
32+
key: ${{ steps.date.outputs.date }}_${{inputs.pixi-version}}_${{hashFiles('pixi.toml')}}
3333
- uses: prefix-dev/[email protected]
3434
if: ${{ !steps.restore.outputs.cache-hit }}
3535
with:
@@ -46,7 +46,7 @@ jobs:
4646
pixi.lock
4747
key: ${{ steps.restore.outputs.cache-primary-key }}
4848
- name: Upload pixi.lock
49-
uses: actions/upload-artifact@v4
49+
uses: actions/upload-artifact@v5
5050
with:
5151
name: pixi-lock
5252
path: pixi.lock

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
os: [ubuntu] #, mac, windows] # TODO v4: Re-enable windows and mac
31+
os: [ubuntu, mac, windows]
3232
pixi-environment: [test-latest]
3333
include:
3434
- os: ubuntu
@@ -38,11 +38,12 @@ jobs:
3838
- os: ubuntu
3939
pixi-environment: "test-minimum"
4040
steps:
41-
- uses: actions/checkout@v4
41+
- uses: actions/checkout@v5
4242
- name: Restore cached pixi lockfile
4343
uses: actions/cache/restore@v4
4444
id: restore-pixi-lock
4545
with:
46+
enableCrossOsArchive: true
4647
path: |
4748
pixi.lock
4849
key: ${{ needs.cache-pixi-lock.outputs.cache-id }}
@@ -54,14 +55,14 @@ jobs:
5455
run: |
5556
pixi run -e ${{ matrix.pixi-environment }} tests -v -s --cov=parcels --cov-report=xml --html="${{ env.COVERAGE_REPORT }}" --self-contained-html
5657
- name: Codecov
57-
uses: codecov/codecov-action@v5.3.1
58+
uses: codecov/codecov-action@v5.5.1
5859
env:
5960
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
6061
with:
6162
flags: unit-tests
6263
- name: Upload test results
6364
if: ${{ always() }} # Always run this step, even if tests fail
64-
uses: actions/upload-artifact@v4
65+
uses: actions/upload-artifact@v5
6566
with:
6667
name: Unittest report ${{ matrix.os }}-${{ matrix.pixi-environment }}
6768
path: ${{ env.COVERAGE_REPORT }}
@@ -82,11 +83,12 @@ jobs:
8283
- os: ubuntu
8384
python-version: "3.11"
8485
steps:
85-
- uses: actions/checkout@v4
86+
- uses: actions/checkout@v5
8687
- name: Restore cached pixi lockfile
8788
uses: actions/cache/restore@v4
8889
id: restore-pixi-lock
8990
with:
91+
enableCrossOsArchive: true
9092
path: |
9193
pixi.lock
9294
key: ${{ needs.cache-pixi-lock.outputs.cache-id }}
@@ -98,14 +100,14 @@ jobs:
98100
run: |
99101
pixi run test-notebooks -v -s --html="${{ env.COVERAGE_REPORT }}" --self-contained-html --cov=parcels --cov-report=xml
100102
- name: Codecov
101-
uses: codecov/codecov-action@v5.3.1
103+
uses: codecov/codecov-action@v5.5.1
102104
env:
103105
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
104106
with:
105107
flags: integration-tests
106108
- name: Upload test results
107109
if: ${{ always() }} # Always run this step, even if tests fail
108-
uses: actions/upload-artifact@v4
110+
uses: actions/upload-artifact@v5
109111
with:
110112
name: Integration test report ${{ matrix.os }}-${{ matrix.pixi-environment }}
111113
path: ${{ env.COVERAGE_REPORT }}
@@ -117,7 +119,7 @@ jobs:
117119
- typechecking
118120
steps:
119121
- name: Merge Artifacts
120-
uses: actions/upload-artifact/merge@v4
122+
uses: actions/upload-artifact/merge@v5
121123
with:
122124
name: Testing reports
123125
pattern: "* report *"
@@ -129,7 +131,7 @@ jobs:
129131
needs: [cache-pixi-lock]
130132
steps:
131133
- name: Checkout
132-
uses: actions/checkout@v4
134+
uses: actions/checkout@v5
133135
- name: Restore cached pixi lockfile
134136
uses: actions/cache/restore@v4
135137
id: restore-pixi-lock
@@ -146,7 +148,7 @@ jobs:
146148
pixi run typing --non-interactive --html-report mypy-report
147149
- name: Upload test results
148150
if: ${{ always() }} # Upload even on mypy error
149-
uses: actions/upload-artifact@v4
151+
uses: actions/upload-artifact@v5
150152
with:
151153
name: Mypy report
152154
path: mypy-report

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- name: Build conda package
1616
uses: prefix-dev/[email protected]
1717
with:

‎.github/workflows/pypi-release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-latest
1414
if: github.repository == 'Parcels-code/parcels'
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717
with:
1818
fetch-depth: 0
19-
- uses: actions/setup-python@v5
19+
- uses: actions/setup-python@v6
2020
name: Install Python
2121
with:
2222
python-version: "3.11"
@@ -42,7 +42,7 @@ jobs:
4242
else
4343
echo "✅ Looks good"
4444
fi
45-
- uses: actions/upload-artifact@v4
45+
- uses: actions/upload-artifact@v5
4646
with:
4747
name: releases
4848
path: dist
@@ -51,11 +51,11 @@ jobs:
5151
needs: build-artifacts
5252
runs-on: ubuntu-latest
5353
steps:
54-
- uses: actions/setup-python@v5
54+
- uses: actions/setup-python@v6
5555
name: Install Python
5656
with:
5757
python-version: "3.11"
58-
- uses: actions/download-artifact@v4
58+
- uses: actions/download-artifact@v6
5959
with:
6060
name: releases
6161
path: dist
@@ -84,7 +84,7 @@ jobs:
8484
if: github.event_name == 'release'
8585
runs-on: ubuntu-latest
8686
steps:
87-
- uses: actions/download-artifact@v4
87+
- uses: actions/download-artifact@v6
8888
with:
8989
name: releases
9090
path: dist

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
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: v5.0.0
3+
rev: v6.0.0
44
hooks:
55
- id: trailing-whitespace
66
- id: end-of-file-fixer
@@ -10,7 +10,7 @@ repos:
1010
types: [text]
1111
files: \.(json|ipynb)$
1212
- repo: https://github.com/astral-sh/ruff-pre-commit
13-
rev: v0.12.5
13+
rev: v0.14.2
1414
hooks:
1515
- id: ruff
1616
name: ruff lint (.py)

‎docs/_static/LAdiag-logo.svg‎

Lines changed: 32 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)