Skip to content

Commit 40d7389

Browse files
committed
Make Spglib optional dependency.
1 parent 5f7c55e commit 40d7389

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

jarvis/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Version number."""
22

3-
__version__ = "2024.5.10"
3+
__version__ = "2024.8.10"
44

55
import os
66

jarvis/analysis/structure/spacegroup.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
"""Modules for handling crystallographic Spacegroup related operations."""
2+
23
from functools import reduce
34
from jarvis.core.lattice import Lattice
45
from jarvis.core.atoms import Atoms
5-
import spglib
66
from jarvis.core.specie import Specie
77
import numpy as np
88
from numpy import sin, cos
99
import itertools
10-
11-
# from fractions import gcd
1210
from jarvis.core.utils import gcd
11+
import os
1312

13+
try:
14+
import spglib
15+
except Exception as exp:
16+
print(exp)
17+
pass
1418
# from numpy import gcd
1519
# from math import gcd
16-
import os
20+
# from fractions import gcd
1721

1822

1923
def unique_rows_2(a):

jarvis/db/figshare.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
import json
1313
import requests
1414
from jarvis.db.jsonutils import loadjson
15-
from jarvis.io.vasp.outputs import Vasprun
16-
from jarvis.io.vasp.inputs import Poscar
17-
from jarvis.io.wannier.outputs import WannierHam
1815
from tqdm import tqdm
1916
import matplotlib.image as mpimg
20-
from jarvis.analysis.stm.tersoff_hamann import TersoffHamannSTM
17+
18+
# from jarvis.analysis.stm.tersoff_hamann import TersoffHamannSTM
19+
# from jarvis.io.wannier.outputs import WannierHam
20+
# from jarvis.io.vasp.outputs import Vasprun
21+
# from jarvis.io.vasp.inputs import Poscar
2122

2223
# import matplotlib.pyplot as plt
2324
# plt.switch_backend("agg")
@@ -598,6 +599,8 @@ def make_stm_from_prev_parchg(
598599
jid="JVASP-667", bias="Negative", filename="stm_image.png", min_size=10
599600
):
600601
"""Make STM images from previously calculated PARVHG files for 2D."""
602+
from jarvis.analysis.stm.tersoff_hamann import TersoffHamannSTM
603+
601604
fls = data("raw_files")
602605
for i in fls["STM"]:
603606
zip_name = jid + "_" + bias + ".zip"
@@ -619,6 +622,9 @@ def make_stm_from_prev_parchg(
619622

620623
def get_wann_electron(jid="JVASP-816"):
621624
"""Download electron WTBH if available."""
625+
from jarvis.io.wannier.outputs import WannierHam
626+
from jarvis.io.vasp.inputs import Poscar
627+
622628
w = ""
623629
ef = ""
624630
fls = data("raw_files")
@@ -650,6 +656,7 @@ def get_wann_phonon(jid="JVASP-1002", factor=15.633302):
650656
"""Download phonon WTBH if available."""
651657
# Requires phonopy
652658
from jarvis.io.phonopy.outputs import get_phonon_tb
659+
from jarvis.io.vasp.outputs import Vasprun
653660

654661
fls = data("raw_files")
655662

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212

1313
setup(
1414
name="jarvis-tools",
15-
version="2024.5.10",
15+
version="2024.8.10",
1616
long_description=long_d,
1717
install_requires=[
1818
"numpy>=1.20.1",
1919
"scipy>=1.5.0",
2020
"matplotlib>=3.0.0",
21-
"spglib>=1.14.1",
2221
"joblib>=0.14.1",
2322
"requests>=2.23.0",
2423
"toolz>=0.9.0",
2524
"xmltodict>=0.11.0",
2625
"tqdm>=4.41.1",
2726
"scikit-learn",
28-
"inflect",
27+
# "spglib>=1.14.1",
28+
# "inflect",
2929
# "mkdocs-material>=9.0.5",
3030
# "markdown>=3.2.1",
3131
# "absl-py==1.4.0",

0 commit comments

Comments
 (0)