Skip to content

Commit b95fa16

Browse files
Merge branch 'main' into ag/batch_cell_list
2 parents 3aa0175 + f9d6cd0 commit b95fa16

File tree

65 files changed

+2763
-6018
lines changed

Some content is hidden

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

65 files changed

+2763
-6018
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,8 @@ jobs:
6262
matrix:
6363
os: [ubuntu-latest, macos-14]
6464
version:
65-
- { python: '3.12', resolution: highest }
6665
- { python: '3.12', resolution: lowest-direct }
6766
- { python: '3.13', resolution: highest }
68-
- { python: '3.13', resolution: lowest-direct }
6967
model:
7068
- { name: fairchem, test_path: "tests/models/test_fairchem.py" }
7169
- { name: fairchem-legacy, test_path: "tests/models/test_fairchem_legacy.py" }
@@ -124,7 +122,7 @@ jobs:
124122
fi
125123
uv pip install -e fairchem-repo/packages/fairchem-core[dev] --system
126124
uv pip install -e "." --no-deps --system
127-
uv pip install "h5py>=3.12.1" "numpy>=1.26,<3" "tables>=3.10.2" "torch>=2" "tqdm>=4.67" --system
125+
uv pip install "h5py>=3.12.1" "numpy>=1.26,<3" "scipy<1.17.0" "tables>=3.10.2" "torch>=2" "tqdm>=4.67" --system
128126
uv pip install "ase>=3.26" "phonopy>=2.37.0" "psutil>=7.0.0" "pymatgen>=2025.6.14" "pytest-cov>=6" "pytest>=8" --resolution=${{ matrix.version.resolution }} --system
129127
130128
@@ -165,7 +163,6 @@ jobs:
165163
- name: Find example scripts
166164
id: set-matrix
167165
run: |
168-
# Find all example scripts but exclude known failing ones
169166
EXAMPLES=$(find examples -name "*.py" | jq -R -s -c 'split("\n")[:-1]')
170167
echo "examples=$EXAMPLES" >> $GITHUB_OUTPUT
171168

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ docs/reference/torch_sim.*
3232
coverage.xml
3333
.coverage*
3434

35+
# test cache (compiled models, etc.)
36+
tests/.cache/
37+
3538
# env
3639
uv.lock
3740

examples/scripts/1_Introduction/1.1_Lennard_Jones.py

Lines changed: 0 additions & 88 deletions
This file was deleted.

examples/scripts/1_Introduction/1.2_MACE.py

Lines changed: 0 additions & 100 deletions
This file was deleted.

examples/scripts/1_Introduction/1.3_fairchem.py

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)