Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
xhqu1981 committed Jan 20, 2016
2 parents d7f1c11 + 42b3aab commit 4f98518
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include *.rst LICENSE ez_setup.py
include *.rst LICENSE requirements*.txt setup.*
recursive-include custodian *.py
recursive-include scripts *.py
prune */*/tests
Expand Down
2 changes: 1 addition & 1 deletion custodian/vasp/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ def correct(self):
vi = VaspInput.from_directory(".")
m = reduce(operator.mul, vi["KPOINTS"].kpts[0])
m = max(int(round(m ** (1 / 3))), 1)
if vi["KPOINTS"].style.lower().startswith("m"):
if vi["KPOINTS"].style.name.lower().startswith("m"):
m += m % 2
actions = [{"dict": "KPOINTS",
"action": {"_set": {"kpoints": [[m] * 3]}}}]
Expand Down
2 changes: 1 addition & 1 deletion requirements-ci.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pymatgen==3.2.3
pymatgen==3.3.1
monty==0.7.0
six==1.9.0
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[aliases]
upload_pypi = upload_docs --upload-dir=docs/_build/html
release = register sdist upload upload_pypi
release = register sdist bdist_wheel upload upload_pypi

[build]
force = 1
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
packages=find_packages(),
version="0.8.8",
install_requires=["monty>=0.7.0", "six"],
extras_require={"vasp, nwchem, qchem": ["pymatgen>=3.2.0"]},
extras_require={"vasp, nwchem, qchem": ["pymatgen>=3.3.1"]},
package_data={},
author="Shyue Ping Ong, William Davidson Richards, Stephen Dacek, "
"Xiaohui Qu",
Expand Down

0 comments on commit 4f98518

Please sign in to comment.