Skip to content

Commit d1d59e8

Browse files
authored
Merge branch 'main' into fairchem_cpp
2 parents 0e0dfd8 + f7983ab commit d1d59e8

61 files changed

Lines changed: 13635 additions & 459 deletions

Some content is hidden

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

.github/dependabot.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ updates:
1717
- "misko"
1818
- "mshuaibii"
1919
- "lbluque"
20+
open-pull-requests-limit: 20
2021

2122
# Python dependencies
2223
- package-ecosystem: pip
@@ -34,9 +35,5 @@ updates:
3435
- "misko"
3536
- "mshuaibii"
3637
- "lbluque"
38+
open-pull-requests-limit: 20
3739

38-
# to ignore certain dependencies
39-
#ignore:
40-
# - dependency-name: pymatgen
41-
# versions:
42-
# -
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
include-paths:
2+
- src/fairchem/data/omc
3+
- packages/fairchem-data-omc
4+
tag-prefix: fairchem_data_omc
5+
tag-template: 'fairchem_data_omc-$RESOLVED_VERSION'
6+
name-template: 'fairchem_data_omc-$RESOLVED_VERSION'
7+
exclude-contributors: [github-actions]
8+
categories:
9+
- title: New Features / Enhancements
10+
labels: [enhancement]
11+
- title: Bug Fixes
12+
labels: [bug]
13+
- title: Documentation
14+
labels: [documentation]
15+
- title: Tests
16+
labels: [test]
17+
- title: Deprecations
18+
labels: [deprecation]
19+
- title: Dependencies
20+
labels: [dependencies]
21+
- title: Other Changes
22+
labels: ["*"]
23+
version-resolver:
24+
major:
25+
labels:
26+
- 'major'
27+
minor:
28+
labels:
29+
- 'minor'
30+
patch:
31+
labels:
32+
- 'patch'
33+
default: patch
34+
template: |
35+
## What’s Changed
36+
37+
$CHANGES

.github/workflows/build.yml

Lines changed: 16 additions & 10 deletions
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@v5
12+
- uses: actions/checkout@v6
1313
with:
1414
fetch-depth: 0 # Optional, use if you use setuptools_scm
1515

@@ -26,7 +26,7 @@ jobs:
2626
- name: Build
2727
run: |
2828
# add packages that are supposed to be built to this list
29-
for package in fairchem-core fairchem-data-oc fairchem-demo-ocpapi fairchem-applications-cattsunami fairchem-data-omol fairchem-data-omat fairchem-lammps
29+
for package in fairchem-core fairchem-data-oc fairchem-demo-ocpapi fairchem-applications-cattsunami fairchem-data-omol fairchem-data-omat fairchem-data-omc fairchem-lammps
3030
do
3131
pushd packages/$package
3232
hatch build
@@ -36,37 +36,43 @@ jobs:
3636
# unfortunately there isn't a clean way to upload artifacts separately so just copy
3737
# for each new package right now
3838
- name: Upload core artifact
39-
uses: actions/upload-artifact@v5
39+
uses: actions/upload-artifact@v6
4040
with:
4141
name: dist-core
4242
path: dist-core/*
4343

4444
- name: Upload data-oc artifact
45-
uses: actions/upload-artifact@v5
45+
uses: actions/upload-artifact@v6
4646
with:
4747
name: dist-data-oc
4848
path: dist-data-oc/*
4949

5050
- name: Upload demo-ocpapi artifact
51-
uses: actions/upload-artifact@v5
51+
uses: actions/upload-artifact@v6
5252
with:
5353
name: dist-demo-ocpapi
5454
path: dist-demo-ocpapi/*
5555

5656
- name: Upload applications-cattsunami artifact
57-
uses: actions/upload-artifact@v5
57+
uses: actions/upload-artifact@v6
5858
with:
5959
name: dist-applications-cattsunami
6060
path: dist-applications-cattsunami/*
6161

6262
- name: Upload lammps artifact
63-
uses: actions/upload-artifact@v5
63+
uses: actions/upload-artifact@v6
6464
with:
6565
name: dist-lammps
6666
path: dist-lammps/*
6767

6868
- name: Upload omat artifact
69-
uses: actions/upload-artifact@v5
69+
uses: actions/upload-artifact@v6
7070
with:
71-
name: dist-omat
72-
path: dist-omat/*
71+
name: dist-data-omat
72+
path: dist-data-omat/*
73+
74+
- name: Upload omc artifact
75+
uses: actions/upload-artifact@v6
76+
with:
77+
name: dist-data-omc
78+
path: dist-data-omc/*

.github/workflows/build_docs.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
# Check out the code
2727
- name: Checkout code
28-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2929
with:
3030
# The path to the sha of the commit we want to build will depend
3131
# on the trigger type. If a workflow_run trigger, then we want
@@ -45,8 +45,8 @@ jobs:
4545
with:
4646
status-context: '${{ github.job }}'
4747

48-
- name: Install pandoc
49-
run: sudo apt-get -y install pandoc
48+
- name: Install pandoc and ffmpeg
49+
run: sudo apt-get update && sudo apt-get -y install pandoc ffmpeg
5050

5151
# Install dependencies
5252
- name: Set up Python
@@ -57,8 +57,12 @@ jobs:
5757
- name: Install dependencies
5858
run: |
5959
python -m pip install --upgrade pip
60-
pip install -e packages/fairchem-core[docs,adsorbml,extras] -e packages/fairchem-data-oc[dev] -e packages/fairchem-applications-cattsunami
61-
pip install -r tests/requirements.txt # pin test packages
60+
pip install \
61+
packages/fairchem-core[docs,adsorbml,extras] \
62+
packages/fairchem-data-oc[dev] \
63+
packages/fairchem-applications-cattsunami \
64+
packages/fairchem-data-omat \
65+
-r tests/requirements.txt # pin test packages
6266
6367
# Build the book
6468
- name: Build the book
@@ -69,12 +73,12 @@ jobs:
6973
FAST_DOCS: ${{ (github.event_name != 'push' || github.ref != 'refs/heads/main') && 'true' || '' }}
7074
run: |
7175
# Convert MyST markdown files to Jupyter notebooks if needed to get download as ipynb buttons
72-
jupytext --to ipynb ./docs/uma_tutorials/uma_tutorial.md
76+
jupytext --to ipynb ./docs/uma_tutorials/*.md
7377
# find ./docs/ -name "*.md" -exec grep -q "format_name: myst" {} \; -print0 | xargs -0 jupytext --to ipynb
7478
jupyter-book build docs
7579
7680
- name: Upload documentation artifact
77-
uses: actions/upload-artifact@v5
81+
uses: actions/upload-artifact@v6
7882
with:
7983
name: docs-html
8084
path: docs/_build/html/*

.github/workflows/deploy_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Download docs artifact
21-
uses: actions/download-artifact@v6
21+
uses: actions/download-artifact@v7
2222
with:
2323
name: docs-html
2424
path: docs-html/

.github/workflows/integration-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
python_version: ['3.10', '3.12']
1616

1717
steps:
18-
- uses: actions/checkout@v5
18+
- uses: actions/checkout@v6
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@v4
25+
uses: actions/cache@v5
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@v5
11+
- uses: actions/checkout@v6
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@v5
18+
- uses: actions/checkout@v6
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@v5
25+
uses: actions/checkout@v6
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
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Release Drafter - fairchem-data-omc
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- 'src/fairchem/data/omc/**'
9+
- 'packages/fairchem-data-omc/**'
10+
workflow_dispatch:
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
update_release_draft:
17+
permissions:
18+
# write permission is required to create a github release
19+
contents: write
20+
pull-requests: read
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: release-drafter/release-drafter@v6
24+
with:
25+
disable-autolabeler: true
26+
config-name: release-drafter-data-omc.yml
27+
env:
28+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)