Skip to content

Commit

Permalink
Emmet bump (#466)
Browse files Browse the repository at this point in the history
* Emmet bump

* Fix tests
  • Loading branch information
munrojm committed Dec 21, 2021
1 parent 8791b61 commit 7ded0a7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 18 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ typing-extensions==4.0.1
maggma==0.38.1
requests==2.26.0
monty==2021.12.1
emmet-core==0.18.0
emmet-core==0.19.1
ratelimit==2.2.1
mpcontribs-client>=3.14.3
20 changes: 3 additions & 17 deletions tests/test_mprester.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,28 +173,14 @@ def test_get_pourbaix_entries(self, mpr):
# Ensure entries are pourbaix compatible
PourbaixDiagram(pbx_entries)

def test_get_ion_reference_data(self, mpr):
ion_data = mpr.get_ion_reference_data("Ti")
assert len(ion_data) == 5

ion_data = mpr.get_ion_reference_data(["Ti", "O"])
assert len(ion_data) == 5

def test_get_ion_entries(self, mpr):
entries = mpr.get_entries_in_chemsys("Ti-O-H")
pd = PhaseDiagram(entries)
ion_entries = mpr.get_ion_entries(pd)
ion_entry_data = mpr.get_ion_reference_data_for_chemsys("Ti-O-H")
ion_entries = mpr.get_ion_entries(pd, ion_entry_data)
assert len(ion_entries) == 5

# also test passing ion data as a kwarg
ion_data = mpr.get_ion_reference_data("Ti")
ion_entries2 = mpr.get_ion_entries(pd, ion_ref_data=ion_data)
assert len(ion_entries2) == len(ion_data)

for e1, e2 in zip(ion_entries, ion_entries2):
assert e1.energy == e2.energy
assert isinstance(e1, IonEntry)
assert isinstance(e2, IonEntry)
assert isinstance(ion_entries[0], IonEntry)

# test an incomplete phase diagram
entries = mpr.get_entries_in_chemsys("Ti-O")
Expand Down

0 comments on commit 7ded0a7

Please sign in to comment.