Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ classifiers = [
"Intended Audience :: System Administrators",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Other/Nonlisted Topic",
"Topic :: Scientific/Engineering",
]
Expand Down Expand Up @@ -48,7 +48,7 @@ amset = ["amset>=0.4.15", "pydash"]
cclib = ["cclib>=1.8.1"]
mp = ["mp-api>=0.37.5"]
phonons = ["phonopy>=2.43.6", "seekpath>=2.0.0"]
lobster = ["ijson>=3.2.2", "lobsterpy>=0.4.0"]
lobster = ["ijson>=3.2.2", "lobsterpy>=0.6.0"]
defects = [
"dscribe>=1.2.0",
"pymatgen-analysis-defects>=2024.5.11",
Expand Down
6 changes: 5 additions & 1 deletion src/atomate2/vasp/flows/mp.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
from typing import TYPE_CHECKING

from jobflow import Flow, Maker
from pymatgen.io.vasp.sets import LobsterSet

try:
from pymatgen.io.vasp.sets import LobsterSet # type: ignore[attr-defined]
except ImportError:
from pymatgen.io.lobster.sets import LobsterSet # type: ignore[attr-defined]

from atomate2.common.jobs.utils import remove_workflow_files
from atomate2.common.utils import _recursive_get_dir_names
Expand Down
6 changes: 5 additions & 1 deletion src/atomate2/vasp/sets/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

import numpy as np
from pymatgen.core.periodic_table import Element
from pymatgen.io.vasp.sets import LobsterSet

try:
from pymatgen.io.vasp.sets import LobsterSet # type: ignore[attr-defined]
except ImportError:
from pymatgen.io.lobster.sets import LobsterSet # type: ignore[attr-defined]

from atomate2.vasp.sets.base import VaspInputGenerator

Expand Down
Loading