Skip to content

Commit 5e1b937

Browse files
authored
Merge branch 'master' into yge/writing-inputfiles
2 parents b0a94fe + 7b6ed16 commit 5e1b937

8 files changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- name: Restore Python environment cache
7171
if: env.has_changes == 'true'
7272
id: restore-env
73-
uses: actions/cache/restore@v5
73+
uses: actions/cache/restore@v6
7474
with:
7575
path: .venv-${{ env.version }}
7676
key: ${{ runner.os }}-venv-${{ env.version }}-${{ hashFiles('devtools/dev-requirements.txt', 'requirements.txt') }}

.github/workflows/black.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
2929
- name: Restore Python environment cache
3030
id: restore-env
31-
uses: actions/cache/restore@v5
31+
uses: actions/cache/restore@v6
3232
with:
3333
path: .venv-${{ env.version }}
3434
key: ${{ runner.os }}-venv-${{ env.version }}-${{ hashFiles('devtools/dev-requirements.txt', 'requirements.txt') }}

.github/workflows/cache_dependencies.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
GH_TOKEN: ${{ github.token }}
1515
strategy:
1616
matrix:
17-
python-version: ['3.10', '3.11', '3.12', '3.13']
17+
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
1818

1919
steps:
2020
- uses: actions/checkout@v7
@@ -52,7 +52,7 @@ jobs:
5252
5353
- name: Cache Python environment
5454
id: cache-env
55-
uses: actions/cache@v5
55+
uses: actions/cache@v6
5656
with:
5757
path: .venv-${{ env.version }}
5858
key: ${{ runner.os }}-venv-${{ env.version }}-${{ hashFiles('devtools/dev-requirements.txt', 'requirements.txt') }}

.github/workflows/memory_benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Restore Python environment cache
5454
if: env.has_changes == 'true'
5555
id: restore-env
56-
uses: actions/cache/restore@v5
56+
uses: actions/cache/restore@v6
5757
with:
5858
path: .venv-${{ env.version }}
5959
key: ${{ runner.os }}-venv-${{ env.version }}-${{ hashFiles('devtools/dev-requirements.txt', 'requirements.txt') }}

.github/workflows/notebook_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- name: Restore Python environment cache
6262
if: env.has_changes == 'true'
6363
id: restore-env
64-
uses: actions/cache/restore@v5
64+
uses: actions/cache/restore@v6
6565
with:
6666
path: .venv-${{ env.version }}
6767
key: ${{ runner.os }}-venv-${{ env.version }}-${{ hashFiles('devtools/dev-requirements.txt', 'requirements.txt') }}

.github/workflows/regression_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- name: Restore Python environment cache
6161
if: env.has_changes == 'true'
6262
id: restore-env
63-
uses: actions/cache/restore@v5
63+
uses: actions/cache/restore@v6
6464
with:
6565
path: .venv-${{ env.version }}
6666
key: ${{ runner.os }}-venv-${{ env.version }}-${{ hashFiles('devtools/dev-requirements.txt', 'requirements.txt') }}

.github/workflows/unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
- name: Restore Python environment cache
6767
if: env.has_changes == 'true'
6868
id: restore-env
69-
uses: actions/cache/restore@v5
69+
uses: actions/cache/restore@v6
7070
with:
7171
path: .venv-${{ env.version }}
7272
key: ${{ runner.os }}-venv-${{ env.version }}-${{ hashFiles('devtools/dev-requirements.txt', 'requirements.txt') }}

requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ diffrax >= 0.6.0, <= 0.7.2
44
equinox >=0.11.10, <=0.13.8
55
h5py >= 3.0.0, <= 3.16.0
66
interpax >= 0.3.3, < 0.4
7-
interpax_fft >= 0.0.6, <= 0.0.7
7+
interpax_fft >= 0.0.6, <= 0.0.9
88
jax-finufft >= 1.1.0, <= 1.3.1
9-
matplotlib >= 3.7.3, <= 3.10.8
9+
matplotlib >= 3.7.3, <= 3.11.0
1010
mpmath >= 1.0.0, <= 1.4.1
1111
netcdf4 >= 1.5.4, !=1.7.4, <= 1.7.5
1212
numpy >= 1.20.0, <= 2.5
1313
nvidia-ml-py >=12.535.77
1414
optax < 0.3
1515
orthax < 0.3
16-
plotly >= 5.16, <= 6.7.0
16+
plotly >= 5.16, <= 6.8.0
1717
psutil <= 7.2.2
1818
pylatexenc >= 2.0, <= 2.10
1919
quadax >= 0.2.2, < 0.3
2020
scikit-image <= 0.26.0
21-
scipy >= 1.7.0, <= 1.17.1
21+
scipy >= 1.7.0, <= 1.18.0
2222
sympy
2323
termcolor <= 3.3.0

0 commit comments

Comments
 (0)