Fix mypy

Author: john-dupuy

src/stac_api_validator/validations.py

@@ -278,7 +278,7 @@ def is_geojson_type(maybe_type: Optional[str]) -> bool:
 def get_catalog(data_dict: Dict[str, Any], r_session: Session) -> Catalog:
     stac_io = StacIO.default()
     if r_session.headers and r_session.headers.get("Authorization"):
-        stac_io.headers = r_session.headers
+        stac_io.headers = r_session.headers  # noqa, type: ignore
         stac_io.headers["Accept-Encoding"] = "*"
     catalog = Catalog.from_dict(data_dict)
     catalog._stac_io = stac_io

tests/test_validations.py

@@ -6,6 +6,8 @@
 import pathlib
 import unittest.mock
 from copy import copy
+from typing import Dict
+from typing import Generator
 
 import pystac
 import pytest
@@ -15,12 +17,12 @@
 
 
 @pytest.fixture
-def r_session():
+def r_session() -> Generator[requests.Session, None, None]:
     yield requests.Session()
 
 
 @pytest.fixture
-def catalog_dict():
+def catalog_dict() -> Generator[Dict[str, str], None, None]:
     current_path = pathlib.Path(os.path.dirname(os.path.abspath(__file__)))
 
     with open(current_path / "resources" / "landing_page.json") as f:
@@ -31,7 +33,7 @@ def catalog_dict():
 
 
 @pytest.fixture
-def sample_item():
+def sample_item() -> Generator[pystac.Item, None, None]:
     current_path = pathlib.Path(os.path.dirname(os.path.abspath(__file__)))
 
     with open(current_path / "resources" / "sample-item.json") as f:
@@ -42,7 +44,7 @@ def sample_item():
 
 
 @pytest.fixture
-def expected_headers():
+def expected_headers() -> Generator[Dict[str, str], None, None]:
     yield {
         "User-Agent": "python-requests/2.28.2",
         "Accept-Encoding": "gzip, deflate",
@@ -52,17 +54,23 @@ def expected_headers():
     }
 
 
-def test_get_catalog(r_session, catalog_dict, expected_headers):
-    r_session.headers = copy(expected_headers)
+def test_get_catalog(
+    r_session: requests.Session,
+    catalog_dict: Dict[str, str],
+    expected_headers: Dict[str, str],
+) -> None:
+    r_session.headers = copy(expected_headers)  # type: ignore
     expected_headers.update({"Accept-Encoding": "*"})
 
     catalog = validations.get_catalog(catalog_dict, r_session)
-    assert catalog._stac_io.headers == expected_headers
+    assert catalog._stac_io.headers == expected_headers  # type: ignore
 
 
-def test_retrieve(r_session, expected_headers):
+def test_retrieve(
+    r_session: requests.Session, expected_headers: Dict[str, str]
+) -> None:
     headers = {"Authorization": "api-key fake-api-key-value"}
-    r_session.send = unittest.mock.MagicMock()
+    r_session.send = unittest.mock.MagicMock()  # type: ignore
     r_session.send.status_code = 500
 
     validations.retrieve(
@@ -78,7 +86,11 @@ def test_retrieve(r_session, expected_headers):
     assert prepared_request_headers == expected_headers
 
 
-def test_validate_api(request, r_session, expected_headers):
+def test_validate_api(
+    request: pytest.FixtureRequest,
+    r_session: requests.Session,
+    expected_headers: Dict[str, str],
+) -> None:
     if request.config.getoption("typeguard_packages"):
         pytest.skip(
             "The import hook that typeguard uses seems to break the mock below."
@@ -104,14 +116,18 @@ def test_validate_api(request, r_session, expected_headers):
 
 
 def test_validate_browseable(
-    request, r_session, catalog_dict, sample_item, expected_headers
-):
+    request: pytest.FixtureRequest,
+    r_session: requests.Session,
+    catalog_dict: Dict[str, str],
+    sample_item: pystac.Item,
+    expected_headers: Dict[str, str],
+) -> None:
     if request.config.getoption("typeguard_packages"):
         pytest.skip(
             "The import hook that typeguard uses seems to break the mock below."
         )
 
-    r_session.headers = copy(expected_headers)
+    r_session.headers = copy(expected_headers)  # type: ignore
 
     with unittest.mock.patch(
         "stac_api_validator.validations.get_catalog"