Update tox configuration and appease mypy.

domdfcoding · domdfcoding · commit caad11f3efb7 · 2025-06-10T11:01:06.000+01:00
diff --git a/repo_helper.yml b/repo_helper.yml
@@ -224,4 +224,8 @@ intersphinx_mapping:
 exclude_files:
  - contributing
  - doc_requirements
- - tox
+
+tox_unmanaged:
+ - testenv
+ - fixups
+ - pytest
diff --git a/sphinx_toolbox/more_autodoc/autonamedtuple.py b/sphinx_toolbox/more_autodoc/autonamedtuple.py
@@ -298,7 +298,7 @@ def filter_members(
 		new_hints = get_type_hints(
 				self.object.__new__,
 				globalns=sys.modules[self.object.__module__].__dict__,
-				localns=self.object.__dict__,  # type: ignore[arg-type]
+				localns=self.object.__dict__,
 				)
 
 		# Stock NamedTuples don't have these, but customised collections.namedtuple or hand-rolled classes may
diff --git a/sphinx_toolbox/more_autodoc/regex.py b/sphinx_toolbox/more_autodoc/regex.py
@@ -613,15 +613,15 @@ class HTMLRegexParser(RegexParser):
 	"""
 
 	# Colours
-	AT_COLOUR = span("regex regex_at")
-	SUBPATTERN_COLOUR = span("regex regex_subpattern")
-	IN_COLOUR = span("regex regex_in")
-	REPEAT_COLOUR = span("regex regex_repeat")
-	REPEAT_BRACE_COLOUR = span("regex regex_repeat_brace")
-	CATEGORY_COLOUR = span("regex regex_category")
-	BRANCH_COLOUR = span("regex regex_branch")
-	LITERAL_COLOUR = span("regex regex_literal")
-	ANY_COLOUR = span("regex regex_any")
+	AT_COLOUR: Callable[[Any], str] = span("regex regex_at")
+	SUBPATTERN_COLOUR: Callable[[Any], str] = span("regex regex_subpattern")
+	IN_COLOUR: Callable[[Any], str] = span("regex regex_in")
+	REPEAT_COLOUR: Callable[[Any], str] = span("regex regex_repeat")
+	REPEAT_BRACE_COLOUR: Callable[[Any], str] = span("regex regex_repeat_brace")
+	CATEGORY_COLOUR: Callable[[Any], str] = span("regex regex_category")
+	BRANCH_COLOUR: Callable[[Any], str] = span("regex regex_branch")
+	LITERAL_COLOUR: Callable[[Any], str] = span("regex regex_literal")
+	ANY_COLOUR: Callable[[Any], str] = span("regex regex_any")
 
 	def parse_pattern(self, regex: Pattern) -> str:
 		"""
@@ -660,15 +660,15 @@ class LaTeXRegexParser(RegexParser):
 	"""
 
 	# Colours
-	AT_COLOUR = latex_textcolor("regex_at")
-	SUBPATTERN_COLOUR = latex_textcolor("regex_subpattern")
-	IN_COLOUR = latex_textcolor("regex_in")
-	REPEAT_COLOUR = latex_textcolor("regex_repeat")
-	REPEAT_BRACE_COLOUR = latex_textcolor("regex_repeat_brace")
-	CATEGORY_COLOUR = latex_textcolor("regex_category")
-	BRANCH_COLOUR = latex_textcolor("regex_branch")
-	LITERAL_COLOUR = latex_textcolor("regex_literal")
-	ANY_COLOUR = latex_textcolor("regex_any")
+	AT_COLOUR: Callable[[Any], str] = latex_textcolor("regex_at")
+	SUBPATTERN_COLOUR: Callable[[Any], str] = latex_textcolor("regex_subpattern")
+	IN_COLOUR: Callable[[Any], str] = latex_textcolor("regex_in")
+	REPEAT_COLOUR: Callable[[Any], str] = latex_textcolor("regex_repeat")
+	REPEAT_BRACE_COLOUR: Callable[[Any], str] = latex_textcolor("regex_repeat_brace")
+	CATEGORY_COLOUR: Callable[[Any], str] = latex_textcolor("regex_category")
+	BRANCH_COLOUR: Callable[[Any], str] = latex_textcolor("regex_branch")
+	LITERAL_COLOUR: Callable[[Any], str] = latex_textcolor("regex_literal")
+	ANY_COLOUR: Callable[[Any], str] = latex_textcolor("regex_any")
 
 	def parse_pattern(self, regex: Pattern) -> str:
 		"""
diff --git a/sphinx_toolbox/more_autosummary/__init__.py b/sphinx_toolbox/more_autosummary/__init__.py
@@ -354,7 +354,7 @@ def create_documenter(  # type: ignore[override]
 
 	else:
 
-		def create_documenter(  # type: ignore[misc]
+		def create_documenter(  # type: ignore[misc,override]
 			self,
 			app: Sphinx,
 			obj: Any,
diff --git a/tests/test_issues_output/test_source_output.py b/tests/test_issues_output/test_source_output.py
@@ -105,7 +105,7 @@ def test_html_output(gh_src_app: Sphinx, html_regression: HTMLRegressionFixture)
 			page = pytest.param(page, id=page)
 
 		pagename: str = page.values[0]  # type: ignore[assignment]
-		page_id: str = page.id or pagename
+		page_id: str = cast(str, page.id or pagename)
 		for mark in page.marks:
 			if mark.kwargs.get("condition", False):
 				if "reason" in mark.kwargs:
diff --git a/tests/test_output/test_output.py b/tests/test_output/test_output.py
@@ -162,7 +162,7 @@ def test_html_output(
 
 	for page in pages_to_check:
 		pagename: str = page.values[0]  # type: ignore[assignment]
-		page_id: str = page.id or pagename
+		page_id: str = cast(str, page.id or pagename)
 
 		for mark in page.marks:
 			if mark.kwargs.get("condition", False):
diff --git a/tox.ini b/tox.ini
@@ -26,7 +26,7 @@ envlist =
     py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4}
     py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1}
     py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
-    py312-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
+    py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
     py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
     pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3}
     pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}
@@ -48,33 +48,20 @@ test =
     py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4}
     py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1}
     py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
-    py312-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
+    py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
     py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
     pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3}
     pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}
     pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4}
 qa = mypy, lint
-cov = py38-sphinx3.2, coverage
+cov = py39-sphinx3.2, coverage
 raspi = py3{7,8,9,10}-sphinx4.5
 
 [testenv:.package]
 setenv =
     PYTHONDEVMODE=1
     PIP_DISABLE_PIP_VERSION_CHECK=1
 
-[testenv:py313]
-download = True
-setenv =
-    PYTHONDEVMODE=1
-    PIP_DISABLE_PIP_VERSION_CHECK=1
-    UNSAFE_PYO3_SKIP_VERSION_CHECK=1
-
-[testenv:py312]
-download = True
-setenv =
-    PYTHONDEVMODE=1
-    PIP_DISABLE_PIP_VERSION_CHECK=1
-
 [testenv:docs]
 setenv = SHOW_TODOS = 1
 passenv = SPHINX_BUILDER
@@ -103,7 +90,7 @@ commands =
     check-wheel-contents dist/
 
 [testenv:lint]
-basepython = python3.8
+basepython = python3.9
 changedir = {toxinidir}
 ignore_errors = True
 skip_install = True
@@ -127,32 +114,32 @@ deps =
     git+https://github.com/domdfcoding/flake8-rst-docstrings.git
     git+https://github.com/python-formate/flake8-unused-arguments.git@magic-methods
     git+https://github.com/python-formate/flake8-missing-annotations.git
-    pydocstyle>=6.0.0
+    git+https://github.com/domdfcoding/pydocstyle.git@stub-functions
     pygments>=2.7.1
     importlib_metadata<4.5.0; python_version<'3.8'
 commands = python3 -m flake8_rst_docstrings_sphinx sphinx_toolbox tests --allow-toolbox {posargs}
 
 [testenv:perflint]
-basepython = python3.8
+basepython = python3.9
 changedir = {toxinidir}
 ignore_errors = True
 skip_install = True
 deps = perflint
 commands = python3 -m perflint sphinx_toolbox {posargs}
 
 [testenv:mypy]
-basepython = python3.8
+basepython = python3.9
 ignore_errors = True
 changedir = {toxinidir}
 extras = all
 deps =
-    mypy==1.11.0
+    mypy==1.16
     -r{toxinidir}/tests/requirements.txt
     -r{toxinidir}/stubs.txt
 commands = mypy sphinx_toolbox tests {posargs}
 
 [testenv:pyup]
-basepython = python3.8
+basepython = python3.9
 skip_install = True
 ignore_errors = True
 changedir = {toxinidir}
@@ -161,7 +148,7 @@ extras = all
 commands = pyup_dirs sphinx_toolbox tests --py36-plus --recursive
 
 [testenv:coverage]
-basepython = python3.8
+basepython = python3.9
 skip_install = True
 ignore_errors = True
 whitelist_externals = /bin/bash
@@ -340,7 +327,6 @@ commands =
 [pytest]
 addopts = --color yes --durations 25
 timeout = 600
-markers = sphinx
 filterwarnings =
     error
     ignore:distutils Version classes are deprecated. Use packaging.version instead.:DeprecationWarning
@@ -364,3 +350,4 @@ filterwarnings =
     always:'parser.split_opt' is deprecated and will be removed in Click 9.0. The old parser is available in 'optparse'.:DeprecationWarning
     always:'OptionParser' is deprecated and will be removed in Click 9.0. The old parser is available in 'optparse'.:DeprecationWarning
     always:The '__version__' attribute is deprecated and will be removed in Click 9.1..:DeprecationWarning
+markers = sphinx

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ def filter_members(`
`298`	`298`	`new_hints = get_type_hints(`
`299`	`299`	`self.object.__new__,`
`300`	`300`	`globalns=sys.modules[self.object.__module__].__dict__,`
`301`		`- localns=self.object.__dict__, # type: ignore[arg-type]`
	`301`	`+ localns=self.object.__dict__,`
`302`	`302`	`)`
`303`	`303`
`304`	`304`	`# Stock NamedTuples don't have these, but customised collections.namedtuple or hand-rolled classes may`