IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bump mypy to 1.15.0

Browse Source
This commit is contained in:
Adam Turner 2025-02-07 13:34:33 +00:00
parent 203a600888
commit c2bea73132
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyproject.toml
View File

@ -82,7 +82,7 @@ docs = [
] ]
lint = [ lint = [
"ruff==0.9.5", "ruff==0.9.5",
"mypy==1.14.1", "mypy==1.15.0",
"sphinx-lint>=0.9", "sphinx-lint>=0.9",
"types-colorama==0.4.15.20240311", "types-colorama==0.4.15.20240311",
"types-defusedxml==0.7.0.20240218", "types-defusedxml==0.7.0.20240218",

40
sphinx/ext/autodoc/importer.py
View File

@ -31,6 +31,7 @@ from sphinx.util.inspect import (
if TYPE_CHECKING: if TYPE_CHECKING:
from collections.abc import Iterator, Mapping from collections.abc import Iterator, Mapping
from importlib.machinery import ModuleSpec
from types import ModuleType from types import ModuleType
from typing import Any, Protocol from typing import Any, Protocol
@ -169,20 +170,7 @@ def import_module(modname: str, try_reload: bool = False) -> Any:
if spec is None: if spec is None:
msg = f'No module named {modname!r}' msg = f'No module named {modname!r}'
raise ModuleNotFoundError(msg, name=modname) # NoQA: TRY301 raise ModuleNotFoundError(msg, name=modname) # NoQA: TRY301
pyi_path = None spec, pyi_path = _find_type_stub_spec(spec, modname)
if spec.origin is not None:
# Try finding a spec for a '.pyi' stubs file for native modules.
for suffix in _NATIVE_SUFFIXES:
if not spec.origin.endswith(suffix):
continue
pyi_path = Path(spec.origin.removesuffix(suffix) + '.pyi')
if not pyi_path.is_file():
continue
pyi_loader = _StubFileLoader(modname, path=str(pyi_path))
pyi_spec = spec_from_loader(modname, loader=pyi_loader)
if pyi_spec is not None:
spec = pyi_spec
break
if pyi_path is None: if pyi_path is None:
module = importlib.import_module(modname) module = importlib.import_module(modname)
else: else:
@ -201,7 +189,7 @@ def import_module(modname: str, try_reload: bool = False) -> Any:
new_modules = [m for m in sys.modules if m not in original_module_names] new_modules = [m for m in sys.modules if m not in original_module_names]
# Try reloading modules with ``typing.TYPE_CHECKING == True``. # Try reloading modules with ``typing.TYPE_CHECKING == True``.
try: try:
typing.TYPE_CHECKING = True typing.TYPE_CHECKING = True # type: ignore[misc]
# Ignore failures; we've already successfully loaded these modules # Ignore failures; we've already successfully loaded these modules
with contextlib.suppress(ImportError, KeyError): with contextlib.suppress(ImportError, KeyError):
for m in new_modules: for m in new_modules:
@ -210,11 +198,31 @@ def import_module(modname: str, try_reload: bool = False) -> Any:
continue continue
_reload_module(sys.modules[m]) _reload_module(sys.modules[m])
finally: finally:
typing.TYPE_CHECKING = False typing.TYPE_CHECKING = False # type: ignore[misc]
module = sys.modules[modname] module = sys.modules[modname]
return module return module
def _find_type_stub_spec(
spec: ModuleSpec, modname: str
) -> tuple[ModuleSpec, Path | None]:
"""Try finding a spec for a PEP 561 '.pyi' stub file for native modules."""
if spec.origin is None:
return spec, None
for suffix in _NATIVE_SUFFIXES:
if not spec.origin.endswith(suffix):
continue
pyi_path = Path(spec.origin.removesuffix(suffix) + '.pyi')
if not pyi_path.is_file():
continue
pyi_loader = _StubFileLoader(modname, path=str(pyi_path))
pyi_spec = spec_from_loader(modname, loader=pyi_loader)
if pyi_spec is not None:
return pyi_spec, pyi_path
return spec, None
class _StubFileLoader(FileLoader): class _StubFileLoader(FileLoader):
"""Load modules from ``.pyi`` stub files.""" """Load modules from ``.pyi`` stub files."""