Skip to content

Commit 7bf7a85

Browse files
committed
clean up setup.py, add dep openbabel for qchem functionality, test.yml install [complete] deps
1 parent ca52e03 commit 7bf7a85

File tree

2 files changed

+18
-28
lines changed

2 files changed

+18
-28
lines changed

atomate/vasp/workflows/base/adsorption.py

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
"""
44

55
import numpy as np
6-
76
from fireworks import Workflow
8-
9-
from atomate.vasp.fireworks.core import OptimizeFW, TransmuterFW
10-
from atomate.utils.utils import get_meta_from_structure
11-
127
from pymatgen.analysis.adsorption import AdsorbateSiteFinder
13-
from pymatgen.core.surface import generate_all_slabs, Slab
8+
from pymatgen.core.surface import Slab, generate_all_slabs
9+
from pymatgen.io.vasp.sets import MVLSlabSet
1410
from pymatgen.transformations.advanced_transformations import SlabTransformation
1511
from pymatgen.transformations.standard_transformations import SupercellTransformation
16-
from pymatgen.io.vasp.sets import MVLSlabSet
12+
13+
from atomate.utils.utils import get_meta_from_structure
14+
from atomate.vasp.fireworks.core import OptimizeFW, TransmuterFW
1715

1816
__author__ = "Joseph Montoya, Richard Tran"
1917
__email__ = "[email protected]"
@@ -176,12 +174,6 @@ def get_slab_trans_params(slab):
176174

177175
min_slab_size = slab_cell_height * slab_layers / total_layers - 0.001
178176
min_vac_size = slab_cell_height * vac_layers / total_layers - 0.001
179-
# params = {"miller_index": [0, 0, 1], "shift": slab.shift,
180-
# "min_slab_size": min_slab_size, "min_vacuum_size": min_vac_size}
181-
# trans = SlabTransformation(**params)
182-
# new_slab = trans.apply_transformation(slab.oriented_unit_cell)
183-
# if slab.composition.reduced_formula == "Si":
184-
# import nose; nose.tools.set_trace()
185177

186178
return {
187179
"miller_index": [0, 0, 1],

setup.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
#!/usr/bin/env python
2-
31
import os
2+
from os.path import abspath, dirname, join
43

5-
from setuptools import setup, find_packages
4+
from setuptools import find_packages, setup
65

7-
module_dir = os.path.dirname(os.path.abspath(__file__))
6+
module_dir = dirname(abspath(__file__))
87

98
if __name__ == "__main__":
109
setup(
1110
name="atomate",
1211
version="1.0.1",
13-
description="atomate has implementations of FireWorks workflows for "
14-
"Materials Science",
15-
long_description=open(os.path.join(module_dir, "README.md")).read(),
12+
description="atomate has implementations of FireWorks workflows for Materials Science",
13+
long_description=open(join(module_dir, "README.md")).read(),
1614
url="https://github.com/hackingmaterials/atomate",
1715
author="Anubhav Jain, Kiran Mathew",
1816
@@ -40,10 +38,15 @@
4038
"maggma>=0.26.0",
4139
],
4240
extras_require={
43-
"rtransfer": ["paramiko>=2.4.2"],
4441
"plotting": ["matplotlib>=1.5.2"],
4542
"phonons": ["phonopy>=1.10.8"],
46-
"complete": ["paramiko>=2.4.2", "matplotlib>=1.5.2", "phonopy>=1.10.8"],
43+
"qchem": ["openbabel"],
44+
"complete": [
45+
"paramiko>=2.4.2",
46+
"matplotlib>=1.5.2",
47+
"phonopy>=1.10.8",
48+
"openbabel",
49+
],
4750
},
4851
classifiers=[
4952
"Programming Language :: Python :: 3",
@@ -57,10 +60,5 @@
5760
"Topic :: Other/Nonlisted Topic",
5861
"Topic :: Scientific/Engineering",
5962
],
60-
test_suite="nose.collector",
61-
tests_require=["nose"],
62-
scripts=[
63-
os.path.join("scripts", f)
64-
for f in os.listdir(os.path.join(module_dir, "scripts"))
65-
],
63+
scripts=[join("scripts", f) for f in os.listdir(join(module_dir, "scripts"))],
6664
)

0 commit comments

Comments
 (0)