Skip to content

Commit a19e23c

Browse files
esoteric-ephemeraesoteric-ephemera
committed
cleanup
1 parent 7913e24 commit a19e23c

9 files changed

Lines changed: 404 additions & 421 deletions

File tree

‎.github/workflows/testing.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
run: python -m mypy mp_api/
5959

6060
- name: Test with pytest
61+
if: always()
6162
env:
6263
MP_API_KEY: ${{ secrets[env.API_KEY_NAME] }}
6364
# MP_API_ENDPOINT: https://api-preview.materialsproject.org/

‎mp_api/client/_server_utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def get_request_headers() -> dict[str, Any]:
3838
Empty dict if flask is not installed, or not in a request context.
3939
Request headers otherwise.
4040
"""
41-
return request.headers if has_request_context() else {}
41+
return request.headers if has_request_context() else {} # type: ignore[return-value]
4242

4343

4444
def is_dev_env(

‎mp_api/client/core/_oxygen_evolution.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def get_oxygen_evolution_from_phase_diagram(
167167
"evolution": "evolution",
168168
}.items()
169169
}
170-
for profile in phase_diagram.get_element_profile("O", composition)
170+
for profile in phase_diagram.get_element_profile("O", composition) # type: ignore[arg-type]
171171
]
172172
for composition in set(compositions)
173173
}

‎mp_api/client/routes/materials/thermo.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,19 @@ def get_phase_diagram_from_chemsys(
166166
phdiag_id = f"thermo_type={t_type}/chemsys={sorted_chemsys}"
167167
version = self.db_version.replace(".", "-")
168168
obj_key = f"objects/{version}/phase-diagrams/{phdiag_id}.jsonl.gz"
169-
pd = self._query_open_data( # type: ignore[union-attr]
169+
pd_dct = self._query_open_data( # type: ignore[union-attr]
170170
bucket="materialsproject-build",
171171
key=obj_key,
172-
decoder=lambda x: load_json(x, deser=True),
172+
decoder=lambda x: load_json(x, deser=False),
173173
)[0][0].get("phase_diagram")
174174

175+
pd = PhaseDiagram.from_dict(
176+
{
177+
k: v if k != "elements" else [e.get("element", e) for e in v]
178+
for k, v in pd_dct.items()
179+
}
180+
)
181+
175182
# Ensure el_ref keys are Element objects for PDPlotter.
176183
# Ensure qhull_data is a numpy array
177184
# This should be fixed in pymatgen

‎requirements/requirements-ubuntu-latest_py3.11.txt‎

Lines changed: 56 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,105 +6,113 @@
66
#
77
annotated-types==0.7.0
88
# via pydantic
9-
arro3-core==0.6.5
9+
arro3-core==0.8.0
1010
# via deltalake
1111
bibtexparser==1.4.4
12-
# via pymatgen
12+
# via pymatgen-core
1313
blake3==1.0.8
1414
# via emmet-core
15-
boto3==1.42.45
15+
boto3==1.42.89
1616
# via mp-api (pyproject.toml)
17-
botocore==1.42.45
17+
botocore==1.42.89
1818
# via
1919
# boto3
2020
# s3transfer
21-
certifi==2026.1.4
21+
certifi==2026.2.25
2222
# via requests
23-
charset-normalizer==3.4.4
23+
charset-normalizer==3.4.7
2424
# via requests
2525
contourpy==1.3.3
2626
# via matplotlib
2727
cycler==0.12.1
2828
# via matplotlib
29-
deltalake==1.4.2
29+
deltalake==1.5.0
3030
# via mp-api (pyproject.toml)
3131
deprecated==1.3.1
3232
# via deltalake
3333
emmet-core==0.86.4rc0
3434
# via mp-api (pyproject.toml)
35-
fonttools==4.61.1
35+
fonttools==4.62.1
3636
# via matplotlib
3737
idna==3.11
3838
# via requests
39+
inflect==7.5.0
40+
# via emmet-core
3941
jmespath==1.1.0
4042
# via
4143
# boto3
4244
# botocore
4345
joblib==1.5.3
44-
# via pymatgen
45-
kiwisolver==1.4.9
46+
# via pymatgen-core
47+
kiwisolver==1.5.0
4648
# via matplotlib
4749
latexcodec==3.0.1
4850
# via pybtex
4951
matplotlib==3.10.8
50-
# via pymatgen
51-
monty==2025.3.3
52+
# via pymatgen-core
53+
monty==2026.2.18
5254
# via
5355
# emmet-core
5456
# mp-api (pyproject.toml)
55-
# pymatgen
57+
# pymatgen-core
58+
more-itertools==11.0.2
59+
# via inflect
5660
mpmath==1.3.0
5761
# via sympy
58-
narwhals==2.16.0
62+
narwhals==2.19.0
5963
# via plotly
6064
networkx==3.6.1
61-
# via pymatgen
62-
numpy==2.4.2
65+
# via pymatgen-core
66+
numpy==2.4.4
6367
# via
6468
# contourpy
6569
# matplotlib
6670
# monty
6771
# pandas
68-
# pymatgen
72+
# pymatgen-core
6973
# pymatgen-io-validation
7074
# scipy
7175
# spglib
72-
orjson==3.11.7
76+
orjson==3.11.8
7377
# via
7478
# mp-api (pyproject.toml)
75-
# pymatgen
76-
packaging==26.0
79+
# pymatgen-core
80+
packaging==26.1
7781
# via
7882
# matplotlib
7983
# plotly
8084
palettable==3.3.3
81-
# via pymatgen
82-
pandas==3.0.0
83-
# via pymatgen
84-
pillow==12.1.0
85+
# via pymatgen-core
86+
pandas==3.0.2
87+
# via pymatgen-core
88+
pillow==12.2.0
8589
# via matplotlib
86-
plotly==6.5.2
87-
# via pymatgen
88-
pyarrow==23.0.0
90+
plotly==6.7.0
91+
# via pymatgen-core
92+
pubchempy==1.0.5
93+
# via emmet-core
94+
pyarrow==23.0.1
8995
# via mp-api (pyproject.toml)
90-
pybtex==0.25.1
96+
pybtex==0.26.1
9197
# via emmet-core
92-
pydantic==2.12.5
98+
pydantic==2.13.0
9399
# via
94100
# emmet-core
95101
# pydantic-settings
96102
# pymatgen-io-validation
97-
pydantic-core==2.41.5
103+
pydantic-core==2.46.0
98104
# via pydantic
99-
pydantic-settings==2.12.0
105+
pydantic-settings==2.13.1
100106
# via
101107
# emmet-core
102108
# pymatgen-io-validation
103-
pymatgen==2025.10.7
109+
pymatgen==2026.3.23
104110
# via
105111
# emmet-core
106112
# mp-api (pyproject.toml)
107113
# pymatgen-io-validation
114+
pymatgen-core==2026.4.7
115+
# via pymatgen
108116
pymatgen-io-validation==0.1.2
109117
# via emmet-core
110118
pyparsing==3.3.2
@@ -116,33 +124,33 @@ python-dateutil==2.9.0.post0
116124
# botocore
117125
# matplotlib
118126
# pandas
119-
python-dotenv==1.2.1
127+
python-dotenv==1.2.2
120128
# via pydantic-settings
121129
pyyaml==6.0.3
122130
# via pybtex
123-
requests==2.32.5
131+
requests==2.33.1
124132
# via
125133
# mp-api (pyproject.toml)
126-
# pymatgen
134+
# pymatgen-core
127135
# pymatgen-io-validation
128136
ruamel-yaml==0.19.1
129-
# via
130-
# monty
131-
# pymatgen
137+
# via monty
132138
s3transfer==0.16.0
133139
# via boto3
134-
scipy==1.17.0
135-
# via pymatgen
140+
scipy==1.17.1
141+
# via pymatgen-core
136142
six==1.17.0
137143
# via python-dateutil
138144
spglib==2.7.0
139-
# via pymatgen
145+
# via pymatgen-core
140146
sympy==1.14.0
141-
# via pymatgen
142-
tabulate==0.9.0
143-
# via pymatgen
147+
# via pymatgen-core
148+
tabulate==0.10.0
149+
# via pymatgen-core
144150
tqdm==4.67.3
145-
# via pymatgen
151+
# via pymatgen-core
152+
typeguard==4.5.1
153+
# via inflect
146154
typing-extensions==4.15.0
147155
# via
148156
# arro3-core
@@ -152,16 +160,17 @@ typing-extensions==4.15.0
152160
# pydantic
153161
# pydantic-core
154162
# spglib
163+
# typeguard
155164
# typing-inspection
156165
typing-inspection==0.4.2
157166
# via
158167
# pydantic
159168
# pydantic-settings
160169
uncertainties==3.2.3
161-
# via pymatgen
170+
# via pymatgen-core
162171
urllib3==2.6.3
163172
# via
164173
# botocore
165174
# requests
166-
wrapt==2.1.1
175+
wrapt==2.1.2
167176
# via deprecated

0 commit comments

Comments
 (0)