Merge branch 'master' into bump_base

pyiron · Sep 27, 2022 · 34fd5ca · 34fd5ca
2 parents 02651dd + 6bc64f5
commit 34fd5ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml
@@ -15,7 +15,7 @@ dependencies:
 - phonopy =2.15.1
 - pint =0.19.2
 - pyiron_base =0.5.24
-- pymatgen =2022.9.8
+- pymatgen =2022.9.21
 - pyscal =2.10.15
 - scipy =1.9.1
 - seekpath =2.0.1

diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@
         'phonopy==2.15.1',
         'pint==0.19.2',
         'pyiron_base==0.5.24',
-        'pymatgen==2022.9.8',
+        'pymatgen==2022.9.21',
         'scipy==1.9.1',
         'seekpath==2.0.1',
         'scikit-learn==1.1.2',