From 3850b8077fedd43e7db26b02814b0bb34ef6cc75 Mon Sep 17 00:00:00 2001 From: Jason Munro Date: Mon, 25 Jul 2022 13:18:44 -0700 Subject: [PATCH] Bump maggma to fix pydantic model sanitization (#644) * Bump maggma * Linting and temp alloy test ignore * Fix rester import * Fix client test --- requirements.txt | 2 +- setup.py | 2 +- src/mp_api/routes/alloys.py | 1 - tests/test_client.py | 5 +++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1ddc9100..3ec33414 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ pydantic>=1.8.2 pymatgen>=2022.3.7 pymatgen-analysis-alloys>=0.0.3 typing-extensions==4.1.1 -maggma==0.47.3 +maggma==0.47.4 requests==2.27.1 monty==2022.3.12 mpcontribs-client>=4.2.9 diff --git a/setup.py b/setup.py index 9e3e48c9..565cf434 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ "requests>=2.23.0", "monty>=2021.3.12", "emmet-core>=0.32.3", - "maggma>=0.47.3", + "maggma>=0.47.4", "mpcontribs-client", ], classifiers=[ diff --git a/src/mp_api/routes/alloys.py b/src/mp_api/routes/alloys.py index bd63683b..6e0ae8db 100644 --- a/src/mp_api/routes/alloys.py +++ b/src/mp_api/routes/alloys.py @@ -12,4 +12,3 @@ class AlloysRester(BaseRester[AlloyPairDoc]): suffix = "alloys" document_model = AlloyPairDoc # type: ignore primary_key = "material_id" - diff --git a/tests/test_client.py b/tests/test_client.py index b1028752..d45b8b3f 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -1,6 +1,6 @@ import os import pytest -from mp_api.matproj import MPRester +from mp_api import MPRester # -- Rester name data for generic tests @@ -31,7 +31,8 @@ "_general_store", "tasks", "xas", - "elasticity" + "elasticity", + "alloys", "summary" ] # temp