Skip to content

Commit

Permalink
remove top-level imports
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisjsewell committed Feb 27, 2019
1 parent 1b62fc4 commit 8103047
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 23 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,6 @@ ENV/

# mypy
.mypy_cache/

# pytest
.pytest_cache/
8 changes: 7 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{
"python.pythonPath": "/anaconda/envs/lsr/bin/python",
"restructuredtext.confPath": ""
"restructuredtext.confPath": "",
"python.unitTest.pyTestArgs": [
"ejplugins"
],
"python.unitTest.unittestEnabled": false,
"python.unitTest.nosetestsEnabled": false,
"python.unitTest.pyTestEnabled": true
}
33 changes: 12 additions & 21 deletions ejplugins/__init__.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
from jsonextended import plugins

from ejplugins.crystal import (CrystalOutputPlugin, CrystalSCFLogPlugin, CrystalDOSPlugin, BANDPlugin,
ECH3CubePlugin, ECH3OutPlugin)
from ejplugins.qespresso import (QEmainPlugin, QEbandPlugin, QEChargeDensityPlugin,
QELowdinPlugin, QEnscfPlugin, QEdosPlugin)
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

from ejplugins.utils import load_test_file, validate_against_schema

__version__ = "0.11.0"

def load_all_parsers():
""" load all parsers
Expand All @@ -26,6 +8,16 @@ def load_all_parsers():
errors: list
"""
from jsonextended import plugins
from ejplugins.crystal import (
CrystalOutputPlugin, CrystalSCFLogPlugin, CrystalDOSPlugin,
BANDPlugin, ECH3CubePlugin, ECH3OutPlugin)
from ejplugins.qespresso import (
QEmainPlugin, QEbandPlugin, QEChargeDensityPlugin,
QELowdinPlugin, QEnscfPlugin, QEdosPlugin)
from ejplugins.gulp import GULPOutPlugin
from ejplugins.lammps import LAMMPSAtomDumpPlugin, LAMMPSSysDumpPlugin

parsers = [CrystalOutputPlugin, CrystalSCFLogPlugin, CrystalDOSPlugin,
BANDPlugin, ECH3CubePlugin, ECH3OutPlugin,
QEmainPlugin, QEbandPlugin, QEChargeDensityPlugin, QELowdinPlugin,
Expand All @@ -41,12 +33,11 @@ def load_all_parsers():


def load_all_encoders():
from jsonextended import plugins
try:
from ejplugins.pymatgen_decode import Encode_Pymatgen
from ejplugins.ase_decode import Encode_ASE
except ImportError:
raise ImportError("pymatgen and/or ase not installed")
return plugins.load_plugin_classes([Encode_Pymatgen, Encode_ASE])


__version__ = "0.10.0"
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
jsonextended>=0.6.4
pathlib2
jsonschema
pint
pint
numpy

0 comments on commit 8103047

Please sign in to comment.