clean up

Author: alexluck-sift

python/lib/sift_client/_tests/test_pytest_plugin.py

@@ -8,8 +8,10 @@
 from __future__ import annotations
 
 import textwrap
+from typing import TYPE_CHECKING
 
-import pytest
+if TYPE_CHECKING:
+    import pytest
 
 pytest_plugins = ["pytester"]
 

python/lib/sift_client/pytest_plugin.py

@@ -168,9 +168,9 @@ def sift_client(pytestconfig: pytest.Config) -> SiftClient:
         )
     return SiftClient(
         connection_config=SiftConnectionConfig(
-            api_key=os.getenv("SIFT_API_KEY"),
-            grpc_url=os.getenv("SIFT_GRPC_URI"),
-            rest_url=os.getenv("SIFT_REST_URI"),
+            api_key=os.environ["SIFT_API_KEY"],
+            grpc_url=os.environ["SIFT_GRPC_URI"],
+            rest_url=os.environ["SIFT_REST_URI"],
         )
     )
 
@@ -268,7 +268,7 @@ def _step_impl(
 def _parametrize_parents(
     report_context: ReportContext,
     request: pytest.FixtureRequest,
-) -> Generator[None, None, None]:
+) -> None:
     """Open/close shared parametrize parent steps for the current item.
 
     Diffs the item's desired parametrize path against the open stack: pops the
@@ -293,7 +293,7 @@ def _parametrize_parents(
         ns = report_context.new_step(name=display, assertion_as_fail_not_error=False)
         ns.__enter__()
         _PARAMETRIZE_STACK.append((display, ns))
-    yield
+    return None
 
 
 @pytest.fixture(autouse=True)

python/lib/sift_client/pytest_plugin_noop.py

@@ -22,7 +22,7 @@
 from __future__ import annotations
 
 from contextlib import AbstractContextManager
-from typing import TYPE_CHECKING, Any, Generator
+from typing import TYPE_CHECKING, Any, Generator, Literal
 
 import pytest
 
@@ -67,7 +67,7 @@ def __init__(self, name: str, description: str | None = None) -> None:
     def __enter__(self) -> _NoopStep:
         return self
 
-    def __exit__(self, exc_type, exc_value, tb) -> bool:
+    def __exit__(self, exc_type, exc_value, tb) -> Literal[False]:
         return False
 
     def measure(