Skip to content

Commit

Permalink
fix optional dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisjsewell committed Feb 27, 2019
1 parent c4f0161 commit 1b62fc4
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
9 changes: 7 additions & 2 deletions ejplugins/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
ECH3CubePlugin, ECH3OutPlugin)
from ejplugins.qespresso import (QEmainPlugin, QEbandPlugin, QEChargeDensityPlugin,
QELowdinPlugin, QEnscfPlugin, QEdosPlugin)
from ejplugins.cif import CIFPlugin
from ejplugins.gulp import GULPOutPlugin
from ejplugins.lammps import LAMMPSAtomDumpPlugin, LAMMPSSysDumpPlugin

# optional dependencies
try:
from ejplugins.pymatgen_decode import Encode_Pymatgen
from ejplugins.ase_decode import Encode_ASE
from ejplugins.cif import CIFPlugin
except ImportError:
pass

Expand All @@ -28,9 +29,13 @@ def load_all_parsers():
parsers = [CrystalOutputPlugin, CrystalSCFLogPlugin, CrystalDOSPlugin,
BANDPlugin, ECH3CubePlugin, ECH3OutPlugin,
QEmainPlugin, QEbandPlugin, QEChargeDensityPlugin, QELowdinPlugin,
CIFPlugin,
GULPOutPlugin,
LAMMPSAtomDumpPlugin, LAMMPSSysDumpPlugin]
try:
from ejplugins.cif import CIFPlugin
parsers.append(CIFPlugin)
except ImportError:
pass

return plugins.load_plugin_classes(parsers, "parsers")

Expand Down
2 changes: 1 addition & 1 deletion ejplugins/qespresso.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from fnmatch import fnmatch

import numpy as np
from ase import Atoms
from ejplugins.utils import codata, split_numbers, symbol2anum
from jsonextended import edict

Expand Down Expand Up @@ -886,6 +885,7 @@ class QEChargeDensityPlugin(object):
file_regex = '*.qe.charge'

def read_file(self, f, **kwargs):
from ase import Atoms # optional dependency
comment = f.readline().strip() # first line blank
line = f.readline().strip()
try:
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
jsonextended>=0.6.4
pathlib2
jsonschema
jsonschema
pint
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
extras_require={
"science": [
"pymatgen",
"ase",
"pint"
]
"ase"
]
},
license='MIT',
author='Chris Sewell',
Expand Down

0 comments on commit 1b62fc4

Please sign in to comment.