Skip to content

Commit

Permalink
Update molecules doc import (#598)
Browse files Browse the repository at this point in the history
* Update materials doc import

* Bump emmet core

* Update emmet core in setup

* Linting

* Re-order reqs

* Reorder

* Bump emmet

* Fix emmet core version in setup

* xfail temp
  • Loading branch information
Jason Munro authored May 11, 2022
1 parent 89de344 commit 6e4da02
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
emmet-core==0.26.2
pydantic>=1.8.2
pymatgen>=2022.3.7
typing-extensions==4.1.1
maggma==0.46.0
requests==2.27.1
monty==2022.3.12
emmet-core==0.24.1
mpcontribs-client>=4.2.9

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"typing-extensions>=3.7.4.1",
"requests>=2.23.0",
"monty>=2021.3.12",
"emmet-core>=0.24.1",
"emmet-core>=0.26.2",
"maggma>=0.46.0",
"mpcontribs-client",
],
Expand Down
2 changes: 1 addition & 1 deletion src/mp_api/routes/molecules.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from pymatgen.core.periodic_table import Element

from mp_api.core.client import BaseRester
from emmet.core.molecules import MoleculesDoc
from emmet.core.molecules_old import MoleculesDoc


class MoleculesRester(BaseRester[MoleculesDoc]):
Expand Down
1 change: 1 addition & 0 deletions tests/test_mprester.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ def test_get_phonon_data_by_material_id(self, mpr):
dos = mpr.get_phonon_dos_by_material_id("mp-11659")
assert isinstance(dos, PhononDos)

@pytest.mark.xfail(reason="SSL issue")
def test_get_charge_density_data(self, mpr):
chgcar = mpr.get_charge_density_from_material_id("mp-149")
assert isinstance(chgcar, Chgcar)
Expand Down

0 comments on commit 6e4da02

Please sign in to comment.