Update dependency pyright to ^1.1.398 (#2795)

* Update dependency pyright to ^1.1.398

* resolve lint errors

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Kyle Finley <kyle@finley.sh>

Author: renovate[bot]

package-lock.json

@@ -1,7 +1,7 @@
 {
   "devDependencies": {
     "cspell": "^8.18.0",
-    "pyright": "^1.1.396"
+    "pyright": "^1.1.398"
   },
   "name": "runway",
   "version": "0.0.0"

package.json

@@ -154,7 +154,7 @@ def __init__(
         follow_symlinks: bool = True,
         page_size: int | None = None,
         result_queue: Queue[Any] | None = None,
-        request_parameters: Any = None,
+        request_parameters: dict[str, Any] | None = None,
     ) -> None:
         """Instantiate class.
 

runway/core/providers/aws/s3/_helpers/file_generator.py

@@ -107,7 +107,7 @@ def format_results(
             if isinstance(value, MutableMap):
                 value = value.find(get)
             elif isinstance(value, dict):
-                value = value.get(get)
+                value = cast("Any", value.get(get))
             else:
                 raise TypeError(f'value must be dict type to use "get"; got type "{type(value)}"')
         if (

runway/lookups/handlers/base.py

@@ -13,13 +13,10 @@
 if TYPE_CHECKING:
     from collections.abc import Generator, Iterator
 
-    from _pytest.config import Config
-    from _pytest.config.argparsing import Parser
-    from _pytest.fixtures import SubRequest
     from click.testing import CliRunner
 
 
-def pytest_configure(config: Config) -> None:
+def pytest_configure(config: pytest.Config) -> None:
     """Configure pytest."""
     config.addinivalue_line(  # cspell:ignore addinivalue
         "markers",
@@ -28,7 +25,7 @@ def pytest_configure(config: Config) -> None:
     )
 
 
-def pytest_addoption(parser: Parser) -> None:
+def pytest_addoption(parser: pytest.Parser) -> None:
     """Add pytest CLI options."""
     parser.addoption(
         "--functional",
@@ -51,7 +48,7 @@ def pytest_addoption(parser: Parser) -> None:
 
 
 @pytest.fixture
-def cli_runner(request: SubRequest) -> CliRunner:
+def cli_runner(request: pytest.FixtureRequest) -> CliRunner:
     """Initialize instance of `click.testing.CliRunner`."""
     return cli_runner_factory(request)
 

tests/conftest.py

@@ -8,10 +8,10 @@
 from click.testing import CliRunner
 
 if TYPE_CHECKING:
-    from _pytest.fixtures import SubRequest
+    import pytest
 
 
-def cli_runner_factory(request: SubRequest) -> CliRunner:
+def cli_runner_factory(request: pytest.FixtureRequest) -> CliRunner:
     """Initialize instance of `click.testing.CliRunner`."""
     kwargs: dict[str, Any] = {
         "env": {
@@ -21,7 +21,7 @@ def cli_runner_factory(request: SubRequest) -> CliRunner:
             **os.environ,
         }
     }
-    mark = request.node.get_closest_marker("cli_runner")
+    mark = cast("pytest.Function | pytest.Item", request.node).get_closest_marker("cli_runner")
     if mark:
         kwargs.update(cast("dict[str, Any]", mark.kwargs))
     return CliRunner(**kwargs)

tests/factories.py

@@ -14,7 +14,6 @@
 if TYPE_CHECKING:
     from collections.abc import Generator
 
-    from _pytest.fixtures import SubRequest
     from click.testing import CliRunner, Result
 
     from runway.config import RunwayConfig
@@ -25,7 +24,7 @@
 
 @pytest.fixture(scope="module")
 def cfngin_config(
-    request: SubRequest, runway_config: RunwayConfig, runway_context: RunwayContext
+    request: pytest.FixtureRequest, runway_config: RunwayConfig, runway_context: RunwayContext
 ) -> CfnginConfig:
     """Find and return the CFNgin config."""
     runway_config.deployments[0].resolve(runway_context, variables=runway_config.variables)

tests/functional/cfngin/test_simple_build/test_runner.py

@@ -19,18 +19,16 @@
 if TYPE_CHECKING:
     from collections.abc import Generator
 
-    from _pytest.config import Config
-    from _pytest.fixtures import SubRequest
     from click.testing import CliRunner
 
 
-def pytest_ignore_collect(path: Any, config: Config) -> bool:  # noqa: ARG001
+def pytest_ignore_collect(path: Any, config: pytest.Config) -> bool:  # noqa: ARG001
     """Determine if this directory should have its tests collected."""
     return not config.option.functional
 
 
 @pytest.fixture(autouse=True, scope="module")
-def cd_test_dir(request: SubRequest) -> Generator[Path, None, None]:
+def cd_test_dir(request: pytest.FixtureRequest) -> Generator[Path, None, None]:
     """Change directory to test directory."""
     test_dir = request.path.parent
     original_wd = Path.cwd()
@@ -55,7 +53,7 @@ def cfngin_bucket_alt() -> str:
 
 @pytest.fixture(scope="module")
 def cfngin_config(
-    request: SubRequest, runway_config: RunwayConfig, runway_context: RunwayContext
+    request: pytest.FixtureRequest, runway_config: RunwayConfig, runway_context: RunwayContext
 ) -> CfnginConfig:
     """Find and return the CFNgin config."""
     runway_config.deployments[0].resolve(runway_context, variables=runway_config.variables)
@@ -82,7 +80,7 @@ def cfngin_context(
 
 
 @pytest.fixture(scope="module")
-def cli_runner(cd_test_dir: Path, request: SubRequest) -> CliRunner:  # noqa: ARG001
+def cli_runner(cd_test_dir: Path, request: pytest.FixtureRequest) -> CliRunner:  # noqa: ARG001
     """Initialize instance of `click.testing.CliRunner`."""
     return cli_runner_factory(request)
 

tests/functional/conftest.py

@@ -11,8 +11,6 @@
 if TYPE_CHECKING:
     from collections.abc import Generator
 
-    from _pytest.fixtures import SubRequest
-
 
 @pytest.fixture(scope="package")
 def fixture_dir() -> Path:
@@ -21,7 +19,7 @@ def fixture_dir() -> Path:
 
 
 @pytest.fixture
-def local_backend(fixture_dir: Path, request: SubRequest) -> Generator[Path, None, None]:
+def local_backend(fixture_dir: Path, request: pytest.FixtureRequest) -> Generator[Path, None, None]:
     """Copy local_backend.tf into the test directory."""
     file_name = "local_backend.tf"
     og_file = fixture_dir / file_name
@@ -32,7 +30,7 @@ def local_backend(fixture_dir: Path, request: SubRequest) -> Generator[Path, Non
 
 
 @pytest.fixture
-def no_backend(fixture_dir: Path, request: SubRequest) -> Generator[Path, None, None]:
+def no_backend(fixture_dir: Path, request: pytest.FixtureRequest) -> Generator[Path, None, None]:
     """Copy no_backend.tf into the test directory."""
     file_name = "no_backend.tf"
     og_file = fixture_dir / file_name
@@ -43,7 +41,7 @@ def no_backend(fixture_dir: Path, request: SubRequest) -> Generator[Path, None,
 
 
 @pytest.fixture
-def s3_backend(fixture_dir: Path, request: SubRequest) -> Generator[Path, None, None]:
+def s3_backend(fixture_dir: Path, request: pytest.FixtureRequest) -> Generator[Path, None, None]:
     """Copy s3_backend.tf into the test directory."""
     file_name = "s3_backend.tf"
     og_file = fixture_dir / file_name

tests/functional/terraform/conftest.py

@@ -15,7 +15,6 @@
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
-    from _pytest.fixtures import SubRequest
     from click.testing import CliRunner, Result
 
 CURRENT_DIR = Path(__file__).parent
@@ -35,7 +34,7 @@ def tf_state_bucket(cli_runner: CliRunner) -> Iterator[None]:
     params=["0.13.7", "0.14.11", "0.15.5", "1.4.6"],
     scope="module",
 )
-def tf_version(request: SubRequest) -> Iterator[str]:
+def tf_version(request: pytest.FixtureRequest) -> Iterator[str]:
     """Set Terraform version."""
     file_path = CURRENT_DIR / TF_VERSION_FILENAME
     file_path.write_text(