Merge branch 'main' into more_xr2

Author: malmans2

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/psf/black
-    rev: 21.5b2
+    rev: 21.6b0
     hooks:
       - id: black
 
@@ -37,11 +37,11 @@ repos:
        - id: darglint
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.812
+    rev: v0.902
     hooks:
       - id: mypy
         exclude: docs
-        additional_dependencies: [xarray]
+        additional_dependencies: [xarray, types-pkg_resources]
 
   - repo: https://github.com/PyCQA/doc8
     rev: 0.9.0a1