Skip to content

Commit 33a0354

Browse files
esoteric-ephemeraesoteric-ephemera
authored
Merge pull request #1194 from esoteric-ephemera/ci_fix
CI fix
2 parents 38d582a + afc7495 commit 33a0354

16 files changed

+16
-16
lines changed

‎.github/workflows/testing.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777

7878
- name: Install all conda requirements
7979
shell: bash -l {0}
80-
run: conda install openbabel openff-toolkit>=0.14.0 openff-interchange>=0.3.22 sqlite -y
80+
run: conda install -c conda-forge openbabel openff-toolkit==0.16.2 openff-interchange==0.3.22 sqlite -y
8181

8282
- name: Install Python dependencies
8383
shell: bash -l {0}

‎emmet-api/requirements/deployment.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ pydantic-settings==2.7.1
188188
# maggma
189189
pydash==8.0.5
190190
# via maggma
191-
pymatgen==2025.1.24
191+
pymatgen==2025.1.9
192192
# via
193193
# emmet-core
194194
# mp-pyrho

‎emmet-api/requirements/ubuntu-latest_py3.10.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ pydantic-settings==2.7.1
186186
# maggma
187187
pydash==8.0.5
188188
# via maggma
189-
pymatgen==2025.1.24
189+
pymatgen==2025.1.9
190190
# via
191191
# emmet-core
192192
# mp-pyrho

‎emmet-api/requirements/ubuntu-latest_py3.10_extras.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ pyflakes==3.2.0
312312
# via flake8
313313
pygments==2.19.1
314314
# via mkdocs-material
315-
pymatgen==2025.1.24
315+
pymatgen==2025.1.9
316316
# via
317317
# emmet-core
318318
# mp-pyrho

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ pydantic-settings==2.7.1
184184
# maggma
185185
pydash==8.0.5
186186
# via maggma
187-
pymatgen==2025.1.24
187+
pymatgen==2025.1.9
188188
# via
189189
# emmet-core
190190
# mp-pyrho

‎emmet-api/requirements/ubuntu-latest_py3.11_extras.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ pyflakes==3.2.0
308308
# via flake8
309309
pygments==2.19.1
310310
# via mkdocs-material
311-
pymatgen==2025.1.24
311+
pymatgen==2025.1.9
312312
# via
313313
# emmet-core
314314
# mp-pyrho

‎emmet-builders/requirements/ubuntu-latest_py3.10.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ pydantic-settings==2.7.1
252252
# maggma
253253
pydash==8.0.5
254254
# via maggma
255-
pymatgen==2025.1.24
255+
pymatgen==2025.1.9
256256
# via
257257
# emmet-core
258258
# matcalc

‎emmet-builders/requirements/ubuntu-latest_py3.10_extras.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ pyflakes==3.2.0
471471
# via flake8
472472
pygments==2.19.1
473473
# via mkdocs-material
474-
pymatgen==2025.1.24
474+
pymatgen==2025.1.9
475475
# via
476476
# chgnet
477477
# emmet-core

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ pydantic-settings==2.7.1
250250
# maggma
251251
pydash==8.0.5
252252
# via maggma
253-
pymatgen==2025.1.24
253+
pymatgen==2025.1.9
254254
# via
255255
# emmet-core
256256
# matcalc

‎emmet-builders/requirements/ubuntu-latest_py3.11_extras.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ pyflakes==3.2.0
467467
# via flake8
468468
pygments==2.19.1
469469
# via mkdocs-material
470-
pymatgen==2025.1.24
470+
pymatgen==2025.1.9
471471
# via
472472
# chgnet
473473
# emmet-core

‎emmet-core/requirements/deployment.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ pydantic-core==2.27.2
7575
# via pydantic
7676
pydantic-settings==2.7.1
7777
# via emmet-core (emmet/emmet-core/setup.py)
78-
pymatgen==2025.1.24
78+
pymatgen==2025.1.9
7979
# via emmet-core (emmet/emmet-core/setup.py)
8080
pyparsing==3.2.1
8181
# via matplotlib

‎emmet-core/requirements/ubuntu-latest_py3.10.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pydantic-core==2.27.2
7070
# via pydantic
7171
pydantic-settings==2.7.1
7272
# via emmet-core (setup.py)
73-
pymatgen==2025.1.24
73+
pymatgen==2025.1.9
7474
# via emmet-core (setup.py)
7575
pyparsing==3.2.1
7676
# via matplotlib

‎emmet-core/requirements/ubuntu-latest_py3.10_extras.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ pyflakes==3.2.0
472472
# via flake8
473473
pygments==2.19.1
474474
# via mkdocs-material
475-
pymatgen==2025.1.24
475+
pymatgen==2025.1.9
476476
# via
477477
# chgnet
478478
# emmet-core

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pydantic-core==2.27.2
7070
# via pydantic
7171
pydantic-settings==2.7.1
7272
# via emmet-core (setup.py)
73-
pymatgen==2025.1.24
73+
pymatgen==2025.1.9
7474
# via emmet-core (setup.py)
7575
pyparsing==3.2.1
7676
# via matplotlib

‎emmet-core/requirements/ubuntu-latest_py3.11_extras.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ pyflakes==3.2.0
468468
# via flake8
469469
pygments==2.19.1
470470
# via mkdocs-material
471-
pymatgen==2025.1.24
471+
pymatgen==2025.1.9
472472
# via
473473
# chgnet
474474
# emmet-core

‎emmet-core/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
},
2929
include_package_data=True,
3030
install_requires=[
31-
"pymatgen>=2024.6.10",
31+
"pymatgen>=2024.6.10,<=2025.1.9", # TODO: release upper version pin when bandgap parsing issues sorted
3232
"monty>=2024.2.2",
3333
"pydantic>=2.0",
3434
"pydantic-settings>=2.0",

0 commit comments

Comments
 (0)