merge conflicts + mypy

Author: esoteric-ephemera

.github/workflows/testing.yml

@@ -60,7 +60,7 @@ jobs:
       - name: Test with pytest
         env:
           MP_API_KEY: ${{ secrets[env.API_KEY_NAME] }}
-          #MP_API_ENDPOINT: https://api-preview.materialsproject.org/
+          # MP_API_ENDPOINT: https://api-preview.materialsproject.org/
         run: |
           pytest -n auto -x --cov=mp_api --cov-report=xml
       - uses: codecov/codecov-action@v1