Update mypy and fix new type errors

bopen · Jan 8, 2022 · 366bacb · 366bacb
1 parent aff094a
commit 366bacb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/environment-ci.yml b/environment-ci.yml
@@ -8,7 +8,7 @@ dependencies:
   - isort
   - make
   - mdformat
-  - mypy = 0.812
+  - mypy
   - netcdf4
   - nomkl
   - numpy >= 1.22.0
@@ -17,6 +17,7 @@ dependencies:
   - pytest-cov
   - rasterio >= 1.2.4
   - rioxarray
+  - types-setuptools
   - xarray >= 0.20.2
   - xmlschema
   - zarr

diff --git a/setup.py b/setup.py
@@ -1,3 +1,3 @@
-import setuptools  # type: ignore
+import setuptools
 
 setuptools.setup(use_scm_version={"fallback_version": "999"})
diff --git a/xarray_sentinel/esa_safe.py b/xarray_sentinel/esa_safe.py
@@ -52,16 +52,13 @@ def cached_sentinel1_schemas(schema_type: str) -> xmlschema.XMLSchema:
     return xmlschema.XMLSchema(SENTINEL1_SCHEMAS[schema_type])
 
 
-cached_ElementTree_parse = functools.lru_cache(ElementTree.parse)
-
-
 def parse_tag(
     xml_path: PathOrFileType,
     query: str,
     schema_type: str = "annotation",
 ) -> T.Dict[str, T.Any]:
     schema = cached_sentinel1_schemas(schema_type)
-    xml_tree = cached_ElementTree_parse(xml_path)
+    xml_tree = ElementTree.parse(xml_path)
     tag_dict: T.Dict[str, T.Any] = schema.to_dict(xml_tree, query)  # type: ignore
     assert isinstance(tag_dict, dict)
     return tag_dict
@@ -73,7 +70,7 @@ def parse_tag_list(
     schema_type: str = "annotation",
 ) -> T.List[T.Dict[str, T.Any]]:
     schema = cached_sentinel1_schemas(schema_type)
-    xml_tree = cached_ElementTree_parse(xml_path)
+    xml_tree = ElementTree.parse(xml_path)
     tag_list: T.List[T.Dict[str, T.Any]] = schema.to_dict(xml_tree, query)  # type: ignore
     assert isinstance(tag_list, list)
     return tag_list