Skip to content

Commit 9e6ee54

Browse files
tomdemeyereJaGeo
andauthored
Add try/except import on LobsterSet module from pymatgen (#1437)
* try/except import * get new lobsterpy version --------- Co-authored-by: jgeorge <janine.george@bam.de>
1 parent 8a45cff commit 9e6ee54

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ classifiers = [
1717
"Intended Audience :: System Administrators",
1818
"Operating System :: OS Independent",
1919
"Programming Language :: Python :: 3",
20-
"Programming Language :: Python :: 3.10",
2120
"Programming Language :: Python :: 3.11",
2221
"Programming Language :: Python :: 3.12",
22+
"Programming Language :: Python :: 3.13",
2323
"Topic :: Other/Nonlisted Topic",
2424
"Topic :: Scientific/Engineering",
2525
]
@@ -48,7 +48,7 @@ amset = ["amset>=0.4.15", "pydash"]
4848
cclib = ["cclib>=1.8.1"]
4949
mp = ["mp-api>=0.37.5"]
5050
phonons = ["phonopy>=2.43.6", "seekpath>=2.0.0"]
51-
lobster = ["ijson>=3.2.2", "lobsterpy>=0.4.0"]
51+
lobster = ["ijson>=3.2.2", "lobsterpy>=0.6.0"]
5252
defects = [
5353
"dscribe>=1.2.0",
5454
"pymatgen-analysis-defects>=2024.5.11",

src/atomate2/vasp/flows/mp.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@
1313
from typing import TYPE_CHECKING
1414

1515
from jobflow import Flow, Maker
16-
from pymatgen.io.vasp.sets import LobsterSet
16+
17+
try:
18+
from pymatgen.io.vasp.sets import LobsterSet # type: ignore[attr-defined]
19+
except ImportError:
20+
from pymatgen.io.lobster.sets import LobsterSet # type: ignore[attr-defined]
1721

1822
from atomate2.common.jobs.utils import remove_workflow_files
1923
from atomate2.common.utils import _recursive_get_dir_names

src/atomate2/vasp/sets/core.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010

1111
import numpy as np
1212
from pymatgen.core.periodic_table import Element
13-
from pymatgen.io.vasp.sets import LobsterSet
13+
14+
try:
15+
from pymatgen.io.vasp.sets import LobsterSet # type: ignore[attr-defined]
16+
except ImportError:
17+
from pymatgen.io.lobster.sets import LobsterSet # type: ignore[attr-defined]
1418

1519
from atomate2.vasp.sets.base import VaspInputGenerator
1620

0 commit comments

Comments
 (0)