Skip to content

Commit 2376703

Browse files
Merge branch 'main' into fix/unxfail-multiple-dataset-predict
2 parents d2046a0 + 4ddffa3 commit 2376703

127 files changed

Lines changed: 7512 additions & 1359 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/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v6
12+
- uses: actions/checkout@v7
1313
with:
1414
fetch-depth: 0 # Optional, use if you use setuptools_scm
1515

.github/workflows/build_docs.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
# Check out the code
3232
- name: Checkout code
33-
uses: actions/checkout@v6
33+
uses: actions/checkout@v7
3434
with:
3535
# The path to the sha of the commit we want to build will depend
3636
# on the trigger type. If a workflow_run trigger, then we want
@@ -42,6 +42,12 @@ jobs:
4242
github.event.pull_request.head.sha ||
4343
github.sha
4444
}}
45+
# Required since actions/checkout began refusing fork PR code in
46+
# workflow_run jobs. Safe here: fork PRs from all external
47+
# contributors require maintainer approval before this trusted,
48+
# secret-holding run can execute (repo Actions setting).
49+
# See https://gh.io/securely-using-pull_request_target
50+
allow-unsafe-pr-checkout: true
4551
# Optional: get full history if needed
4652
fetch-depth: 0
4753

@@ -50,7 +56,7 @@ jobs:
5056
with:
5157
status-context: '${{ github.job }}'
5258

53-
- uses: actions/setup-node@v6
59+
- uses: actions/setup-node@v7
5460
with:
5561
node-version: 18.x
5662

@@ -99,4 +105,4 @@ jobs:
99105
if: always()
100106
uses: ./.github/actions/multi-trigger-cleanup
101107
with:
102-
status-context: '${{ github.job }}'
108+
status-context: '${{ github.job }}'

.github/workflows/integration-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ jobs:
1212
strategy:
1313
max-parallel: 10
1414
matrix:
15-
python_version: ['3.10', '3.12']
15+
python_version: ['3.11', '3.14']
1616

1717
steps:
18-
- uses: actions/checkout@v6
18+
- uses: actions/checkout@v7
1919
- name: Set up Python ${{ matrix.python_version }}
2020
uses: actions/setup-python@v6
2121
with:
2222
python-version: ${{ matrix.python_version }}
2323

2424
- name: Cache pip
25-
uses: actions/cache@v5
25+
uses: actions/cache@v6
2626
with:
2727
path: ~/.cache/pip
2828
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}

.github/workflows/label_checker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
check-labels:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v6
11+
- uses: actions/checkout@v7
1212
- name: Labels not added (patch, minor, major, dependencies)
1313
if: >
1414
contains(github.event.pull_request.labels.*.name, 'patch') == false &&

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
max-parallel: 6
1616

1717
steps:
18-
- uses: actions/checkout@v6
18+
- uses: actions/checkout@v7
1919
- name: Set up Python
2020
uses: actions/setup-python@v6
2121
with:

.github/workflows/perf-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323
# Check out the code
2424
- name: Checkout code
25-
uses: actions/checkout@v6
25+
uses: actions/checkout@v7
2626
with:
2727
# The path to the sha of the commit we want to test will depend
2828
# on the trigger type. If a workflow_run trigger, then we want

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
issues: write
1111
pull-requests: write
1212
steps:
13-
- uses: actions/stale@v10.3.0
13+
- uses: actions/stale@v11.0.0
1414
with:
1515
days-before-stale: 30
1616
days-before-close: 14

.github/workflows/test.yml

Lines changed: 46 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
# Without it, GitHub auto-expands EVERY field of the object-typed
3333
# `shard` matrix entry — including `shard.paths` — into a
3434
# >100-character truncated string like
35-
# `test (3.13, core, tests/core/models tests/core/graph ...`.
35+
# `test (3.14, core, tests/core/models tests/core/graph ...`.
3636
# That diverges from the short custom status emitted by
3737
# multi-trigger-setup, forcing branch protection to pick one event
3838
# type's names and break the others.
@@ -54,7 +54,7 @@ jobs:
5454
max-parallel: 10
5555
fail-fast: false
5656
matrix:
57-
python_version: ['3.11', '3.13']
57+
python_version: ['3.11', '3.14']
5858
# tests/perf is run by perf-test.yml on a separate cadence.
5959
# tests/applications and tests/lammps are run by integration-test.yml
6060
# and test_lammps_gpu respectively. Both shards below intentionally
@@ -69,9 +69,15 @@ jobs:
6969

7070
steps:
7171
- name: Checkout code
72-
uses: actions/checkout@v6
72+
uses: actions/checkout@v7
7373
with:
7474
ref: ${{ env.HEAD_SHA }}
75+
# Required since actions/checkout began refusing fork PR code in
76+
# workflow_run jobs. Safe here: fork PRs from all external
77+
# contributors require maintainer approval before this trusted,
78+
# secret-holding run can execute (repo Actions setting).
79+
# See https://gh.io/securely-using-pull_request_target
80+
allow-unsafe-pr-checkout: true
7581
# Optional: get full history if needed
7682
fetch-depth: 0
7783

@@ -86,7 +92,7 @@ jobs:
8692
python-version: ${{ matrix.python_version }}
8793

8894
- name: Cache pip
89-
uses: actions/cache@v5
95+
uses: actions/cache@v6
9096
with:
9197
path: ~/.cache/pip
9298
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
@@ -106,7 +112,7 @@ jobs:
106112
-r tests/requirements.txt # pin test packages
107113
108114
- name: Install torchsim (Python 3.12+)
109-
if: ${{ matrix.python_version == '3.12' || matrix.python_version == '3.13' }}
115+
if: ${{ matrix.python_version == '3.12' || matrix.python_version == '3.13' || matrix.python_version == '3.14' }}
110116
run: |
111117
pip install packages/fairchem-core[torchsim]
112118
@@ -139,16 +145,16 @@ jobs:
139145
run: |
140146
pytest -m "serial and not gpu" ${{ matrix.shard.paths }} -vv --ignore=tests/demo/ocpapi/tests/integration/ --exclude-models=uma-s-1p1,uma-s-1p2 --cov-report=xml --cov=fairchem --cov-append --junitxml=junit-serial-${{ matrix.shard.name }}.xml -o junit_family=legacy -c ./packages/fairchem-core/pyproject.toml --suppress-no-test-exit-code
141147
142-
- if: ${{ matrix.python_version == '3.13' }}
148+
- if: ${{ matrix.python_version == '3.14' }}
143149
name: codecov-coverage
144-
uses: codecov/codecov-action@v6
150+
uses: codecov/codecov-action@v7
145151
with:
146152
fail_ci_if_error: false
147153
files: ./coverage.xml
148154
token: ${{ secrets.CODECOV_TOKEN }}
149155
verbose: true
150156

151-
- if: ${{ matrix.python_version == '3.13' }}
157+
- if: ${{ matrix.python_version == '3.14' }}
152158
name: codecov-test-results
153159
uses: codecov/test-results-action@v1
154160
with:
@@ -174,15 +180,18 @@ jobs:
174180
strategy:
175181
fail-fast: false
176182
matrix:
177-
python_version: ['3.13']
183+
python_version: ['3.14']
178184
sweep_model: [uma-s-1p1, uma-s-1p2]
179185
shard: *cpu_shards
180186

181187
steps:
182188
- name: Checkout code
183-
uses: actions/checkout@v6
189+
uses: actions/checkout@v7
184190
with:
185191
ref: ${{ env.HEAD_SHA }}
192+
# See the checkout step in the `test` job for why this is set
193+
# and why it is safe (external-contributor approval gate).
194+
allow-unsafe-pr-checkout: true
186195
fetch-depth: 0
187196

188197
- name: Setup
@@ -196,7 +205,7 @@ jobs:
196205
python-version: ${{ matrix.python_version }}
197206

198207
- name: Cache pip
199-
uses: actions/cache@v5
208+
uses: actions/cache@v6
200209
with:
201210
path: ~/.cache/pip
202211
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
@@ -216,7 +225,7 @@ jobs:
216225
-r tests/requirements.txt # pin test packages
217226
218227
- name: Install torchsim (Python 3.12+)
219-
if: ${{ matrix.python_version == '3.12' || matrix.python_version == '3.13' }}
228+
if: ${{ matrix.python_version == '3.12' || matrix.python_version == '3.13' || matrix.python_version == '3.14' }}
220229
run: |
221230
pip install packages/fairchem-core[torchsim]
222231
@@ -276,7 +285,7 @@ jobs:
276285
strategy:
277286
fail-fast: false
278287
matrix:
279-
python_version: ['3.13']
288+
python_version: ['3.14']
280289
# YAML anchor: shard list is reused by test_gpu_sweep below.
281290
# Do not reorder jobs (the alias must follow the anchor textually).
282291
shard: &gpu_shards
@@ -287,9 +296,15 @@ jobs:
287296

288297
steps:
289298
- name: Checkout code
290-
uses: actions/checkout@v6
299+
uses: actions/checkout@v7
291300
with:
292301
ref: ${{ env.HEAD_SHA }}
302+
# Required since actions/checkout began refusing fork PR code in
303+
# workflow_run jobs. Safe here: fork PRs from all external
304+
# contributors require maintainer approval before this trusted,
305+
# secret-holding run can execute (repo Actions setting).
306+
# See https://gh.io/securely-using-pull_request_target
307+
allow-unsafe-pr-checkout: true
293308
# Optional: get full history if needed
294309
fetch-depth: 0
295310

@@ -312,7 +327,7 @@ jobs:
312327
-r tests/requirements.txt # pin test packages
313328
314329
- name: Install torchsim (Python 3.12+)
315-
if: ${{ matrix.python_version == '3.12' || matrix.python_version == '3.13' }}
330+
if: ${{ matrix.python_version == '3.12' || matrix.python_version == '3.13' || matrix.python_version == '3.14' }}
316331
run: |
317332
pip install packages/fairchem-core[torchsim]
318333
@@ -360,15 +375,18 @@ jobs:
360375
strategy:
361376
fail-fast: false
362377
matrix:
363-
python_version: ['3.13']
378+
python_version: ['3.14']
364379
sweep_model: [uma-s-1p1, uma-s-1p2]
365380
shard: *gpu_shards
366381

367382
steps:
368383
- name: Checkout code
369-
uses: actions/checkout@v6
384+
uses: actions/checkout@v7
370385
with:
371386
ref: ${{ env.HEAD_SHA }}
387+
# See the checkout step in the `test` job for why this is set
388+
# and why it is safe (external-contributor approval gate).
389+
allow-unsafe-pr-checkout: true
372390
fetch-depth: 0
373391

374392
- name: Setup
@@ -390,7 +408,7 @@ jobs:
390408
-r tests/requirements.txt # pin test packages
391409
392410
- name: Install torchsim (Python 3.12+)
393-
if: ${{ matrix.python_version == '3.12' || matrix.python_version == '3.13' }}
411+
if: ${{ matrix.python_version == '3.12' || matrix.python_version == '3.13' || matrix.python_version == '3.14' }}
394412
run: |
395413
pip install packages/fairchem-core[torchsim]
396414
@@ -432,20 +450,26 @@ jobs:
432450
strategy:
433451
max-parallel: 1
434452
matrix:
435-
python_version: ['3.13']
453+
python_version: ['3.14']
436454

437455
steps:
438-
- uses: actions/checkout@v6
456+
- uses: actions/checkout@v7
439457
- uses: mamba-org/setup-micromamba@v3
440458
with:
441459
generate-run-shell: true # This is the default behavior
442460
environment-name: test_env # Specifies a new environment to be created
443-
create-args: python=3.13 # Specifies packages to install into the new environment
461+
create-args: python=3.14 # Specifies packages to install into the new environment
444462

445463
- name: Checkout code
446-
uses: actions/checkout@v6
464+
uses: actions/checkout@v7
447465
with:
448466
ref: ${{ env.HEAD_SHA }}
467+
# Required since actions/checkout began refusing fork PR code in
468+
# workflow_run jobs. Safe here: fork PRs from all external
469+
# contributors require maintainer approval before this trusted,
470+
# secret-holding run can execute (repo Actions setting).
471+
# See https://gh.io/securely-using-pull_request_target
472+
allow-unsafe-pr-checkout: true
449473
# Optional: get full history if needed
450474
fetch-depth: 0
451475

0 commit comments

Comments
 (0)