Merge branch 'develop' of https://github.com/abinit/abipy into develop

abinit · Aug 29, 2023 · 830830d · 830830d
2 parents cad9694 + b93ece7
commit 830830d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/abipy/flowtk/abitimer.py b/abipy/flowtk/abitimer.py
@@ -1,3 +1,9 @@
 # flake8: noqa
-#from pymatgen.io.abinit.abitimer import AbinitTimerParserError, AbinitTimerParser, AbinitTimerSection
-from pymatgen.io.abinit.abitimer import AbinitTimerParseError, AbinitTimerParser, AbinitTimerSection
+from pymatgen.core import __version__ as pmg_version
+from pymatgen.io.abinit.abitimer import AbinitTimerParser, AbinitTimerSection
+
+
+if pmg_version < '2023.7.10':
+    from pymatgen.io.abinit.abitimer import AbinitTimerParserError as AbinitTimerParseError
+else:
+    from pymatgen.io.abinit.abitimer import AbinitTimerParseError