Skip to content

Commit

Permalink
Use either pyscal2/3 in calphy job
Browse files Browse the repository at this point in the history
MPIE env recently switched from pyscal2 to pyscal3 because calphy dropped
the dependency on pyscal2.
  • Loading branch information
pmrv committed Dec 10, 2024
1 parent f2df8f4 commit 94b51a9
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion pyiron_atomistics/calphy/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@
from calphy import Alchemy, Calculation, Liquid, Solid
from calphy import __version__ as calphy_version
from calphy.routines import routine_alchemy, routine_fe, routine_pscale, routine_ts
from pyscal.trajectory import Trajectory as PyscalTrajectory
# both trajectory classes behave the same, so we can use either depending
# on the env
try:
from pyscal.trajectory import Trajectory as PyscalTrajectory
except ImportError:
from pyscal3.trajectory import Trajectory as PyscalTrajectory

__author__ = "Sarath Menon"
__copyright__ = (
Expand Down

0 comments on commit 94b51a9

Please sign in to comment.