Fixups and use Incomplete instead of Any

Author: Avasam

setuptools/__init__.py

@@ -1,9 +1,4 @@
 """Extensions to the 'distutils' for large or complex distributions"""
-# mypy: disable_error_code=override
-# Command.reinitialize_command has an extra **kw param that distutils doesn't have
-# Can't disable on the exact line because distutils doesn't exists on Python 3.12
-# and mypy isn't aware of distutils_hack, causing distutils.core.Command to be Any,
-# and a [unused-ignore] to be raised on 3.12+
 
 from __future__ import annotations
 
@@ -215,7 +210,7 @@ def ensure_string_list(self, option):
                     "'%s' must be a list of strings (got %r)" % (option, val)
                 )
 
-    @overload
+    @overload  # type: ignore[override] # Has an extra **kw param that distutils doesn't have
     def reinitialize_command(
         self, command: str, reinit_subcommands: bool = False, **kw
     ) -> _Command: ...

setuptools/command/editable_wheel.py

@@ -231,7 +231,6 @@ def _set_editable_mode(self):
         """Set the ``editable_mode`` flag in the build sub-commands"""
         dist = self.distribution
         build = dist.get_command_obj("build")
-        # TODO: Update typeshed distutils stubs to overload non-None return type by default
         for cmd_name in build.get_sub_commands():
             cmd = dist.get_command_obj(cmd_name)
             if hasattr(cmd, "editable_mode"):

setuptools/config/setupcfg.py

@@ -24,10 +24,8 @@
     Generic,
     Iterable,
     Iterator,
-    List,
     Tuple,
     TypeVar,
-    cast,
 )
 
 from packaging.markers import default_environment as marker_env
@@ -109,8 +107,7 @@ def _apply(
     filenames = [*other_files, filepath]
 
     try:
-        # TODO: Temporary cast until mypy 1.12 is released with upstream fixes from typeshed
-        _Distribution.parse_config_files(dist, filenames=cast(List[str], filenames))
+        _Distribution.parse_config_files(dist, filenames=filenames)
         handlers = parse_configuration(
             dist, dist.command_options, ignore_option_errors=ignore_option_errors
         )

typings/distutils-stubs/__init__.pyi

@@ -1,5 +0,0 @@
-# Attempts to improve these stubs are probably not the best use of time:
-# - distutils is deleted in Python 3.12 and newer
-# - Most users already do not use stdlib distutils, due to setuptools monkeypatching
-# - We have very little quality assurance on these stubs, since due to the two above issues
-#   we allowlist all distutils errors in stubtest.

typings/distutils-stubs/ccompiler.pyi

@@ -1,6 +1,7 @@
-from _typeshed import BytesPath, StrPath, Unused
 from collections.abc import Callable, Iterable
 from typing import ClassVar, Literal, TypeVar, overload
+
+from _typeshed import BytesPath, StrPath, Unused
 from typing_extensions import TypeAlias, TypeVarTuple, Unpack
 
 _Macro: TypeAlias = tuple[str] | tuple[str, str | None]
@@ -9,12 +10,23 @@ _BytesPathT = TypeVar("_BytesPathT", bound=BytesPath)
 _Ts = TypeVarTuple("_Ts")
 
 def gen_lib_options(
-    compiler: CCompiler, library_dirs: list[str], runtime_library_dirs: list[str], libraries: list[str]
+    compiler: CCompiler,
+    library_dirs: list[str],
+    runtime_library_dirs: list[str],
+    libraries: list[str],
 ) -> list[str]: ...
-def gen_preprocess_options(macros: list[_Macro], include_dirs: list[str]) -> list[str]: ...
-def get_default_compiler(osname: str | None = None, platform: str | None = None) -> str: ...
+def gen_preprocess_options(
+    macros: list[_Macro], include_dirs: list[str]
+) -> list[str]: ...
+def get_default_compiler(
+    osname: str | None = None, platform: str | None = None
+) -> str: ...
 def new_compiler(
-    plat: str | None = None, compiler: str | None = None, verbose: bool = False, dry_run: bool = False, force: bool = False
+    plat: str | None = None,
+    compiler: str | None = None,
+    verbose: bool = False,
+    dry_run: bool = False,
+    force: bool = False,
 ) -> CCompiler: ...
 def show_compilers() -> None: ...
 
@@ -38,7 +50,9 @@ class CCompiler:
     library_dirs: list[str]
     runtime_library_dirs: list[str]
     objects: list[str]
-    def __init__(self, verbose: bool = False, dry_run: bool = False, force: bool = False) -> None: ...
+    def __init__(
+        self, verbose: bool = False, dry_run: bool = False, force: bool = False
+    ) -> None: ...
     def add_include_dir(self, dir: str) -> None: ...
     def set_include_dirs(self, dirs: list[str]) -> None: ...
     def add_library(self, libname: str) -> None: ...
@@ -52,7 +66,9 @@ class CCompiler:
     def add_link_object(self, object: str) -> None: ...
     def set_link_objects(self, objects: list[str]) -> None: ...
     def detect_language(self, sources: str | list[str]) -> str | None: ...
-    def find_library_file(self, dirs: list[str], lib: str, debug: bool = False) -> str | None: ...
+    def find_library_file(
+        self, dirs: list[str], lib: str, debug: bool = False
+    ) -> str | None: ...
     def has_function(
         self,
         funcname: str,
@@ -153,21 +169,40 @@ class CCompiler:
         extra_postargs: list[str] | None = None,
     ) -> None: ...
     @overload
-    def executable_filename(self, basename: str, strip_dir: Literal[0, False] = 0, output_dir: StrPath = "") -> str: ...
+    def executable_filename(
+        self, basename: str, strip_dir: Literal[False] = False, output_dir: StrPath = ""
+    ) -> str: ...
     @overload
-    def executable_filename(self, basename: StrPath, strip_dir: Literal[1, True], output_dir: StrPath = "") -> str: ...
+    def executable_filename(
+        self, basename: StrPath, strip_dir: Literal[True], output_dir: StrPath = ""
+    ) -> str: ...
     def library_filename(
-        self, libname: str, lib_type: str = "static", strip_dir: bool = False, output_dir: StrPath = ""
+        self,
+        libname: str,
+        lib_type: str = "static",
+        strip_dir: bool = False,
+        output_dir: StrPath = "",
     ) -> str: ...
     def object_filenames(
-        self, source_filenames: Iterable[StrPath], strip_dir: bool = False, output_dir: StrPath | None = None
+        self,
+        source_filenames: Iterable[StrPath],
+        strip_dir: bool = False,
+        output_dir: StrPath | None = '',
     ) -> list[str]: ...
     @overload
-    def shared_object_filename(self, basename: str, strip_dir: Literal[0, False] = 0, output_dir: StrPath = "") -> str: ...
+    def shared_object_filename(
+        self, basename: str, strip_dir: Literal[False] = False, output_dir: StrPath = ""
+    ) -> str: ...
     @overload
-    def shared_object_filename(self, basename: StrPath, strip_dir: Literal[1, True], output_dir: StrPath = "") -> str: ...
+    def shared_object_filename(
+        self, basename: StrPath, strip_dir: Literal[True], output_dir: StrPath = ""
+    ) -> str: ...
     def execute(
-        self, func: Callable[[Unpack[_Ts]], Unused], args: tuple[Unpack[_Ts]], msg: str | None = None, level: int = 1
+        self,
+        func: Callable[[Unpack[_Ts]], Unused],
+        args: tuple[Unpack[_Ts]],
+        msg: str | None = None,
+        level: int = 1,
     ) -> None: ...
     def spawn(self, cmd: list[str]) -> None: ...
     def mkpath(self, name: str, mode: int = 0o777) -> None: ...

typings/distutils-stubs/cmd.pyi

@@ -23,7 +23,6 @@ from distutils.command.register import register
 from distutils.command.sdist import sdist
 from distutils.command.upload import upload
 from distutils.dist import Distribution
-from distutils.file_util import _BytesPathT, _StrPathT
 from typing import Any, ClassVar, Literal, TypeVar, overload
 from typing_extensions import TypeVarTuple, Unpack
 

typings/distutils-stubs/command/bdist_dumb.pyi

@@ -1,4 +1,5 @@
-from typing import Any, ClassVar
+from _typeshed import Incomplete
+from typing import ClassVar
 
 from ..cmd import Command
 
@@ -7,15 +8,15 @@ class bdist_dumb(Command):
     user_options: ClassVar[list[tuple[str, str | None, str]]]
     boolean_options: ClassVar[list[str]]
     default_format: ClassVar[dict[str, str]]
-    bdist_dir: Any
-    plat_name: Any
-    format: Any
+    bdist_dir: Incomplete
+    plat_name: Incomplete
+    format: Incomplete
     keep_temp: int
-    dist_dir: Any
-    skip_build: Any
+    dist_dir: Incomplete
+    skip_build: Incomplete
     relative: int
-    owner: Any
-    group: Any
+    owner: Incomplete
+    group: Incomplete
     def initialize_options(self) -> None: ...
     def finalize_options(self) -> None: ...
     def run(self) -> None: ...

typings/distutils-stubs/command/build_py.pyi

@@ -32,7 +32,7 @@ class build_py(Command):
     def find_all_modules(self): ...
     def get_source_files(self): ...
     def get_module_outfile(self, build_dir, package, module): ...
-    def get_outputs(self, include_bytecode: bool = True): ...
+    def get_outputs(self, include_bytecode: bool = True) -> list[str]: ...
     def build_module(self, module, module_file, package): ...
     def build_modules(self) -> None: ...
     def build_packages(self) -> None: ...

typings/distutils-stubs/command/build_scripts.pyi

@@ -1,24 +1,21 @@
-from typing import Any, ClassVar
+from _typeshed import Incomplete
+from typing import ClassVar
 
 from ..cmd import Command
-from ..util import Mixin2to3 as Mixin2to3
 
-first_line_re: Any
+first_line_re: Incomplete
 
 class build_scripts(Command):
     description: str
     user_options: ClassVar[list[tuple[str, str, str]]]
     boolean_options: ClassVar[list[str]]
-    build_dir: Any
-    scripts: Any
-    force: Any
-    executable: Any
-    outfiles: Any
+    build_dir: Incomplete
+    scripts: Incomplete
+    force: Incomplete
+    executable: Incomplete
+    outfiles: Incomplete
     def initialize_options(self) -> None: ...
     def finalize_options(self) -> None: ...
     def get_source_files(self): ...
     def run(self) -> None: ...
     def copy_scripts(self): ...
-
-class build_scripts_2to3(build_scripts, Mixin2to3):
-    def copy_scripts(self): ...

typings/distutils-stubs/command/check.pyi

@@ -1,22 +1,19 @@
-from typing import Any, ClassVar, Final, Literal
-from typing_extensions import TypeAlias
+from typing import ClassVar, Final
 
-from ..cmd import Command
+from _typeshed import Incomplete
+from docutils.utils import Reporter
 
-_Reporter: TypeAlias = Any  # really docutils.utils.Reporter
+from ..cmd import Command
 
-# Only defined if docutils is installed.
-# Depends on a third-party stub. Since distutils is deprecated anyway,
-# it's easier to just suppress the "any subclassing" error.
-class SilentReporter(_Reporter):
-    messages: Any
+class SilentReporter(Reporter):
+    messages: Incomplete
     def __init__(
         self,
         source,
         report_level,
         halt_level,
-        stream: Any | None = ...,
-        debug: bool | Literal[0, 1] = 0,
+        stream: Incomplete | None = ...,
+        debug: bool = False,
         encoding: str = ...,
         error_handler: str = ...,
     ) -> None: ...