proper types for MonkeyPatch

Author: mr-c

setup.py

@@ -135,7 +135,7 @@
     setup_requires=PYTEST_RUNNER,
     test_suite="tests",
     tests_require=[
-        "pytest >= 6.0.2, < 6.2",
+        "pytest >= 6.2, < 6.3",
         "mock >= 2.0.0",
         "pytest-mock >= 1.10.0",
         "arcp >= 0.2.0",

test-requirements.txt

@@ -1,4 +1,4 @@
-pytest >= 6.0.2, < 6.2
+pytest >= 6.2, < 6.3
 pytest-xdist
 mock >= 2.0.0
 pytest-mock >= 1.10.0

tests/test_ext.py

@@ -2,7 +2,6 @@
 import re
 from io import StringIO
 from pathlib import Path
-from typing import Any
 
 import pytest
 
@@ -32,7 +31,7 @@ def test_listing_deep() -> None:
 
 
 @needs_docker
-def test_cwltool_options(monkeypatch: Any) -> None:
+def test_cwltool_options(monkeypatch: pytest.MonkeyPatch) -> None:
     """Check setting options via environment variable."""
     monkeypatch.setenv("CWLTOOL_OPTIONS", "--enable-ext")
     params = [

tests/test_mpi.py

@@ -193,7 +193,7 @@ def test_mpi_workflow(self, fake_mpi_conf: str, tmp_path: Path) -> None:
                 assert lc == np
 
     def test_environment(
-        self, fake_mpi_conf: str, tmp_path: Path, monkeypatch: Any
+        self, fake_mpi_conf: str, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
     ) -> None:
         stdout = StringIO()
         stderr = StringIO()
@@ -217,13 +217,14 @@ def test_environment(
             assert e["TEST_MPI_FOO"] == "bar"
 
 
-def test_env_passing(monkeypatch: Any) -> None:
+def test_env_passing(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Confirm that MPI extension passes environment variables correctly."""
     config = MpiConfig(
         env_pass=["A", "B", "LONG_NAME"],
         env_pass_regex=["TOOLNAME", "MPI_.*_CONF"],
     )
 
-    env = {}  # type: MutableMapping[str, str]
+    env: MutableMapping[str, str] = {}
 
     with monkeypatch.context() as m:
         m.setattr(os, "environ", {})

tests/test_procgenerator.py

@@ -1,13 +1,14 @@
 """ProcessGenerator related tests."""
 
-from typing import Any
+
+import pytest
 
 from cwltool.main import main
 
 from .util import get_data
 
 
-def test_missing_enable_ext(monkeypatch: Any) -> None:
+def test_missing_enable_ext(monkeypatch: pytest.MonkeyPatch) -> None:
     """Test missing enable-ext option fails.
 
     Check that a workflow that needs `--enable-ext` and

tests/test_rdfprint.py

@@ -1,6 +1,7 @@
 import subprocess
 import sys
-from typing import Any
+
+import pytest
 
 from cwltool.main import main
 
@@ -11,7 +12,7 @@ def test_rdf_print() -> None:
     assert main(["--print-rdf", get_data("tests/wf/hello_single_tool.cwl")]) == 0
 
 
-def test_rdf_print_unicode(monkeypatch: Any) -> None:
+def test_rdf_print_unicode(monkeypatch: pytest.MonkeyPatch) -> None:
     """Force ASCII encoding but load UTF file with --print-rdf."""
     monkeypatch.setenv("LC_ALL", "C")
 

tests/test_tmpdir.py

@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import List, cast
 
-from _pytest.monkeypatch import MonkeyPatch
+import pytest
 from ruamel.yaml.comments import CommentedMap
 from schema_salad.avro import schema
 from schema_salad.sourceline import cmap
@@ -105,7 +105,9 @@ def test_commandLineTool_job_tmpdir_prefix(tmp_path: Path) -> None:
 
 
 @needs_docker
-def test_dockerfile_tmpdir_prefix(tmp_path: Path, monkeypatch: MonkeyPatch) -> None:
+def test_dockerfile_tmpdir_prefix(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
     """Test that DockerCommandLineJob.get_image respects temp directory directives."""
     monkeypatch.setattr(
         target=subprocess, name="check_call", value=lambda *args, **kwargs: True

tests/test_windows_warning.py

@@ -1,7 +1,6 @@
 """Test user experience running on MS Windows."""
 
 import os
-import warnings
 
 import pytest
 

tests/util.py

@@ -3,7 +3,7 @@
 import os
 import shutil
 from pathlib import Path
-from typing import Any, Generator, List, Mapping, Optional, Tuple, Union
+from typing import Generator, List, Mapping, Optional, Tuple, Union
 
 import pytest
 from pkg_resources import Requirement, ResolutionError, resource_filename
@@ -55,7 +55,7 @@ def get_main_output(
     env: Union[
         Mapping[bytes, Union[bytes, str]], Mapping[str, Union[bytes, str]], None
     ] = None,
-    monkeypatch: Any = None,
+    monkeypatch: Optional[pytest.MonkeyPatch] = None,
 ) -> Tuple[Optional[int], str, str]:
     stdout = io.StringIO()
     stderr = io.StringIO()