Skip to content

Commit af667d8

Browse files
authored
revert ase dep to pypi release but install from main branch in CI (#670)
1 parent 26f7cd3 commit af667d8

File tree

5 files changed

+13
-3
lines changed

5 files changed

+13
-3
lines changed

.github/workflows/deploy.yml

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
- name: Install dependencies
2929
run: |
3030
python -m pip install --upgrade pip
31+
# ase needed to get FrechetCellFilter used by ML force fields
32+
pip install git+https://gitlab.com/ase/ase
3133
pip install .[strict,docs]
3234
3335
- name: Build

.github/workflows/docs.yml

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333
- name: Install dependencies
3434
run: |
3535
python -m pip install --upgrade pip
36+
# ase needed to get FrechetCellFilter used by ML force fields
37+
pip install git+https://gitlab.com/ase/ase
3638
pip install .[strict,docs]
3739
3840
- name: Build

.github/workflows/testing.yml

+4
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ jobs:
5252
# emmet-core 0.70.0 depends on pymatgen>=2023.10.11
5353
run: |
5454
python -m pip install --upgrade pip
55+
# ase needed to get FrechetCellFilter used by ML force fields
56+
pip install git+https://gitlab.com/ase/ase
5557
pip install .[strict,tests]
5658
5759
- name: Test
@@ -80,6 +82,8 @@ jobs:
8082
- name: Install dependencies
8183
run: |
8284
python -m pip install --upgrade pip
85+
# ase needed to get FrechetCellFilter used by ML force fields
86+
pip install git+https://gitlab.com/ase/ase
8387
pip install .[strict,docs]
8488
8589
- name: Build

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ default_language_version:
22
python: python3
33
repos:
44
- repo: https://github.com/charliermarsh/ruff-pre-commit
5-
rev: v0.1.9
5+
rev: v0.1.11
66
hooks:
77
- id: ruff
88
args: [--fix]

pyproject.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ phonons = ["phonopy>=1.10.8", "seekpath"]
4545
lobster = ["ijson>=3.2.2", "lobsterpy>=0.3.4"]
4646
defects = ["dscribe>=1.2.0", "pymatgen-analysis-defects>=2022.11.30"]
4747
forcefields = [
48-
"ase@git+https://gitlab.com/ase/ase",
48+
"ase>=3.22.1",
4949
"chgnet>=0.2.2",
5050
"mace-torch>=0.3.3",
5151
"matgl>=0.9.0",
@@ -67,7 +67,9 @@ dev = ["pre-commit>=2.12.1"]
6767
tests = ["FireWorks==2.0.3", "pytest-cov==4.1.0", "pytest==7.4.4"]
6868
strict = [
6969
"PyYAML==6.0.1",
70-
"ase@git+https://gitlab.com/ase/ase@2bab58f4e",
70+
# must use >= for ase to not uninstall main branch install in CI
71+
# last known working commit: https://gitlab.com/ase/ase@2bab58f4e
72+
"ase>=3.22.1",
7173
"cclib==1.8",
7274
"chgnet==0.3.3",
7375
"click==8.1.7",

0 commit comments

Comments
 (0)