Merge remote-tracking branch 'materialsproject/master' into electrode…

…_doc
materialsproject · Jan 13, 2021 · 1a385fc · 1a385fc
2 parents 1eff36a + 987507f
commit 1a385fc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2.3.4
 
-    - uses: actions/setup-python@v2.1.4
+    - uses: actions/setup-python@v2.2.1
       with:
         python-version: 3.7
 
@@ -43,7 +43,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2.3.4
 
-    - uses: actions/setup-python@v2.1.4
+    - uses: actions/setup-python@v2.2.1
       with:
         python-version: 3.7
 

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v2.3.4
 
       - name: Set up Python 3.7
-        uses: actions/setup-python@v2.1.4
+        uses: actions/setup-python@v2.2.1
         with:
           python-version: 3.7
 
@@ -52,7 +52,7 @@ jobs:
       - uses: actions/checkout@v2.3.4
 
       - name: Set up Python 3.7
-        uses: actions/setup-python@v2.1.4
+        uses: actions/setup-python@v2.2.1
         with:
           python-version: 3.7
 
@@ -85,7 +85,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2.3.4
 
-    - uses: actions/setup-python@v2.1.4
+    - uses: actions/setup-python@v2.2.1
       with:
         python-version: 3.8
 

diff --git a/emmet-core/requirements.txt b/emmet-core/requirements.txt
@@ -1,4 +1,4 @@
-pymatgen>=2020.12.18
+pymatgen==2020.12.31
 monty==4.0.2
 pydantic==1.7.3
 pybtex==0.23.0