Skip to content

Commit

Permalink
Bump emmet and update reference to legacy elasticity (#620)
Browse files Browse the repository at this point in the history
* Bump emmet and update reference to legacy elasticity

* Temp ignore tests
  • Loading branch information
munrojm committed Jun 10, 2022
1 parent 3ea2f4b commit 96eaabb
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
emmet-core==0.27.5
emmet-core==0.28.2
pydantic>=1.8.2
pymatgen>=2022.3.7
typing-extensions==4.1.1
Expand Down
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.27.5",
"emmet-core>=0.28.2",
"maggma>=0.46.0",
"mpcontribs-client",
],
Expand Down
2 changes: 1 addition & 1 deletion src/mp_api/routes/elasticity.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from collections import defaultdict
from typing import List, Optional, Tuple

from emmet.core.elasticity import ElasticityDoc
from emmet.core.elasticity_legacy import ElasticityDoc
from mp_api.core.client import BaseRester

import warnings
Expand Down
1 change: 1 addition & 0 deletions tests/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"_general_store",
"tasks",
"xas",
"elasticity"
] # temp


Expand Down
2 changes: 1 addition & 1 deletion tests/test_elasticity.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def rester():

custom_field_tests = {} # type: dict


@pytest.mark.xfail(reason="Temporary xfail until deployment")
@pytest.mark.skipif(
os.environ.get("MP_API_KEY", None) is None, reason="No API key found."
)
Expand Down

0 comments on commit 96eaabb

Please sign in to comment.