993 mypy also gettin rough

Author: teks

tests/extensions/test_custom.py

@@ -1,5 +1,6 @@
 """Tests creating a custom extension"""
 
+from collections.abc import Generator
 from datetime import datetime
 from typing import Any, Generic, TypeVar, cast
 
@@ -119,7 +120,7 @@ def migrate(
 
 
 @pytest.fixture
-def add_extension_hooks() -> None:
+def add_extension_hooks() -> Generator[None]:
     pystac.EXTENSION_HOOKS.add_extension_hooks(CustomExtensionHooks())
     yield
     pystac.EXTENSION_HOOKS.remove_extension_hooks(SCHEMA_URI)

tests/extensions/test_eo.py

@@ -52,6 +52,13 @@ def test_to_from_dict() -> None:
     assert_to_from_dict(Item, item_dict)
 
 
+def test_from_file_to_dict(ext_item_uri: str, ext_item: pystac.Item) -> None:
+    with open(ext_item_uri) as f:
+        d = json.load(f)
+    actual = ext_item.to_dict(include_self_link=False)
+    assert actual == d
+
+
 def test_add_to() -> None:
     item = Item.from_file(PLAIN_ITEM)
     assert EOExtension.get_schema_uri() not in item.stac_extensions
@@ -283,7 +290,7 @@ def test_item_apply() -> None:
     test_band = Band.create(name="test")
 
     assert eo_ext.cloud_cover == 78
-    assert test_band not in eo_ext.bands or []
+    assert test_band not in (eo_ext.bands or [])
 
     eo_ext.apply(bands=[test_band], cloud_cover=15)
     assert eo_ext.bands is not None
@@ -380,13 +387,6 @@ def ext_item(ext_item_uri: str) -> pystac.Item:
     return pystac.Item.from_file(ext_item_uri)
 
 
-def test_to_from_dict(ext_item_uri: str, ext_item: pystac.Item) -> None:
-    with open(ext_item_uri) as f:
-        d = json.load(f)
-    actual = ext_item.to_dict(include_self_link=False)
-    assert actual == d
-
-
 @pytest.mark.parametrize("field", ["cloud_cover", "snow_cover"])
 def test_get_field(ext_item: pystac.Item, field: str) -> None:
     prop = ext_item.properties[f"{PREFIX}{field}"]

tests/extensions/test_pointcloud.py

@@ -26,7 +26,7 @@ def example_uri() -> str:
 
 
 @pytest.fixture
-def pc_item(example_uri) -> pystac.Item:
+def pc_item(example_uri: str) -> pystac.Item:
     return pystac.Item.from_file(example_uri)
 
 
@@ -274,7 +274,7 @@ def test_pointcloud_statistics() -> None:
 
 
 def test_statistics_accessor_when_no_stats(pc_no_stats_item: pystac.Item) -> None:
-    assert PointcloudExtension.ext(pc_no_stats_item).statistics == None
+    assert PointcloudExtension.ext(pc_no_stats_item).statistics is None
 
 
 def test_asset_extension(pc_no_stats_item: pystac.Item) -> None: