Bump mypy version and python runtime, and increase annotation coverage.

Author: domdfcoding

repo_helper.yml

@@ -15,6 +15,7 @@ use_whey: true
 enable_conda: False
 sphinx_html_theme: furo
 docs_fail_on_warning: true
+mypy_version: "1.8.0"
 
 python_versions:
  - 3.7

tests/test_hooks.py

@@ -1,11 +1,12 @@
 # 3rd party
 import pytest
 from coincidence.selectors import not_pypy
+from domdf_python_tools.paths import PathPlus
 from testing_tox import run_tox
 
 
 @pytest.fixture()
-def basic_docs_testenv(tmp_pathplus):
+def basic_docs_testenv(tmp_pathplus: PathPlus) -> PathPlus:
 	build_dir = tmp_pathplus / "doc-source" / "build"
 	build_dir.mkdir(parents=True)
 
@@ -19,7 +20,7 @@ def basic_docs_testenv(tmp_pathplus):
 	return build_dir
 
 
-def test_rmdir_docs(basic_docs_testenv, tmp_pathplus, capsys):
+def test_rmdir_docs(basic_docs_testenv: PathPlus, tmp_pathplus: PathPlus, capsys):
 	with (tmp_pathplus / "tox.ini").open('a') as fp:
 		fp.write('recreate_hook = builtin.rmdir(r"{toxinidir}/doc-source/build")\n')
 
@@ -36,7 +37,7 @@ def test_rmdir_docs(basic_docs_testenv, tmp_pathplus, capsys):
 
 
 @not_pypy("mypy does noy support PyPy")
-def test_rmdir_mypy(tmp_pathplus, capsys):
+def test_rmdir_mypy(tmp_pathplus: PathPlus, capsys):
 
 	cache_dir = tmp_pathplus / ".mypy_cache"
 	cache_dir.mkdir()
@@ -60,7 +61,8 @@ def test_rmdir_mypy(tmp_pathplus, capsys):
 	assert f"mypy recreate hook: removing {cache_dir}" in stdout
 
 
-def test_simple_custom_hook(basic_docs_testenv, tmp_pathplus, capsys):
+@pytest.mark.usefixtures("basic_docs_testenv")
+def test_simple_custom_hook(tmp_pathplus: PathPlus, capsys):
 	with (tmp_pathplus / "tox.ini").open('a') as fp:
 		fp.write('recreate_hook = "hello world"')
 
@@ -73,7 +75,8 @@ def test_simple_custom_hook(basic_docs_testenv, tmp_pathplus, capsys):
 	assert f"docs recreate hook: hello world" in stdout
 
 
-def test_custom_hook(basic_docs_testenv, tmp_pathplus, capsys):
+@pytest.mark.usefixtures("basic_docs_testenv")
+def test_custom_hook(tmp_pathplus: PathPlus, capsys):
 	with (tmp_pathplus / "tox.ini").open('a') as fp:
 		fp.write('recreate_hook = custom_hook.custom_hook()\n')
 
@@ -91,7 +94,8 @@ def test_custom_hook(basic_docs_testenv, tmp_pathplus, capsys):
 	assert f"docs recreate hook: this is a custom hook" in stdout
 
 
-def test_no_hook(basic_docs_testenv, tmp_pathplus, capsys):
+@pytest.mark.usefixtures("basic_docs_testenv")
+def test_no_hook(tmp_pathplus: PathPlus, capsys):
 
 	try:
 		run_tox(["-e", "docs", "-r"], tmp_pathplus)
@@ -103,7 +107,7 @@ def test_no_hook(basic_docs_testenv, tmp_pathplus, capsys):
 	assert "docs recreate hook: " not in stdout
 
 
-def test_not_recreate(basic_docs_testenv, tmp_pathplus, capsys):
+def test_not_recreate(basic_docs_testenv: PathPlus, tmp_pathplus: PathPlus, capsys):
 	with (tmp_pathplus / "tox.ini").open('a') as fp:
 		fp.write('recreate_hook = builtin.rmdir(r"{toxinidir}/doc-source/build")\n')
 

tox.ini

@@ -116,7 +116,7 @@ basepython = python3.8
 ignore_errors = True
 changedir = {toxinidir}
 deps =
-    mypy==0.971
+    mypy==1.8.0
     -r{toxinidir}/tests/requirements.txt
     types-first
 commands = mypy tox_recreate_hook tests {posargs}

tox_recreate_hook/__init__.py

@@ -31,13 +31,13 @@
 import sys
 from contextlib import contextmanager
 from importlib import import_module
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Iterator
 
 # 3rd party
-import pluggy  # type: ignore
+import pluggy
 from domdf_python_tools.paths import in_directory
 from first import first
-from tox import reporter  # type: ignore
+from tox import reporter  # type: ignore[import-untyped]
 
 # this package
 import tox_recreate_hook.hooks
@@ -48,9 +48,9 @@
 
 	# 3rd party
 	from domdf_python_tools.typing import PathLike
-	from tox.action import Action  # type: ignore
-	from tox.config import Config, TestenvConfig  # type: ignore
-	from tox.venv import VirtualEnv  # type: ignore
+	from tox.action import Action  # type: ignore[import-untyped]
+	from tox.config import Config, TestenvConfig  # type: ignore[import-untyped]
+	from tox.venv import VirtualEnv  # type: ignore[import-untyped]
 
 __author__: str = "Dominic Davis-Foster"
 __copyright__: str = "2021 Dominic Davis-Foster"
@@ -64,7 +64,7 @@
 
 
 @contextmanager
-def append_to_sys_path(path: "PathLike"):
+def append_to_sys_path(path: "PathLike") -> Iterator[None]:
 	"""
 	Append ``path`` to :py:obj:`sys.path` for the scope of the :keyword:`with` block.