Fix all mypy issues

.gitignore

@@ -8,6 +8,7 @@ lib
 distribute.egg-info
 setuptools.egg-info
 .coverage
+test_*
 .eggs
 .tox
 .venv

pkg_resources/__init__.py

@@ -23,6 +23,7 @@
 import time
 import re
 import types
+from typing import TYPE_CHECKING, Optional
 import zipfile
 import zipimport
 import warnings
@@ -43,11 +44,7 @@
 import importlib
 from pkgutil import get_importer
 
-try:
-    import _imp
-except ImportError:
-    # Python 3.2 compatibility
-    import imp as _imp
+import _imp
 
 try:
     FileExistsError
@@ -68,8 +65,10 @@
 from os import open as os_open
 from os.path import isdir, split
 
+importlib_machinery: Optional[types.ModuleType]
 try:
-    import importlib.machinery as importlib_machinery
+    import importlib.machinery
+    importlib_machinery = importlib.machinery
 
     # access attribute to force import under delayed import mechanisms.
     importlib_machinery.__name__
@@ -2231,7 +2230,8 @@ def resolve_egg_link(path):
 if hasattr(pkgutil, 'ImpImporter'):
     register_finder(pkgutil.ImpImporter, find_on_path)
 
-register_finder(importlib_machinery.FileFinder, find_on_path)
+if importlib_machinery:
+    register_finder(importlib_machinery.FileFinder, find_on_path)
 
 _declare_state('dict', _namespace_handlers={})
 _declare_state('dict', _namespace_packages={})
@@ -2398,7 +2398,8 @@ def file_ns_handler(importer, path_item, packageName, module):
     register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
 
 register_namespace_handler(zipimport.zipimporter, file_ns_handler)
-register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler)
+if importlib_machinery:
+    register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler)
 
 
 def null_ns_handler(importer, path_item, packageName, module):

pkg_resources/extern/__init__.py

@@ -1,5 +1,6 @@
 import importlib.util
 import sys
+from typing import TYPE_CHECKING
 
 
 class VendorImporter:
@@ -78,3 +79,10 @@ def install(self):
     'more_itertools',
 )
 VendorImporter(__name__, names).install()
+
+if TYPE_CHECKING:
+    from . import packaging as packaging
+    import platformdirs as platformdirs
+    import jaraco as jaraco
+    import importlib_resources as importlib_resources
+    import more_itertools as more_itertools

pkg_resources/extern/packaging/__init__.pyi

@@ -0,0 +1,14 @@
+from packaging import *
+from . import _elffile as _elffile
+from . import _manylinux as _manylinux
+from . import _musllinux as _musllinux
+from . import _parser as _parser
+from . import _structures as _structures
+from . import _tokenizer as _tokenizer
+from . import markers as markers
+from . import metadata as metadata
+from . import requirements as requirements
+from . import specifiers as specifiers
+from . import tags as tags
+from . import utils as utils
+from . import version as version

pkg_resources/extern/packaging/_elffile.pyi

@@ -0,0 +1 @@
+from packaging._elffile import *

pkg_resources/extern/packaging/_manylinux.pyi

@@ -0,0 +1 @@
+from packaging._manylinux import *

pkg_resources/extern/packaging/_musllinux.pyi

@@ -0,0 +1 @@
+from packaging._musllinux import *

pkg_resources/extern/packaging/_parser.pyi

@@ -0,0 +1 @@
+from packaging._parser import *

pkg_resources/extern/packaging/_structures.pyi

@@ -0,0 +1 @@
+from packaging._structures import *

pkg_resources/extern/packaging/_tokenizer.pyi

@@ -0,0 +1 @@
+from packaging._tokenizer import *

pkg_resources/extern/packaging/markers.pyi

@@ -0,0 +1 @@
+from packaging.markers import *

pkg_resources/extern/packaging/metadata.pyi

@@ -0,0 +1 @@
+from packaging.metadata import *

pkg_resources/extern/packaging/requirements.pyi

@@ -0,0 +1 @@
+from packaging.requirements import *

pkg_resources/extern/packaging/specifiers.pyi

@@ -0,0 +1 @@
+from packaging.specifiers import *

pkg_resources/extern/packaging/tags.pyi

@@ -0,0 +1 @@
+from packaging.tags import *

pkg_resources/extern/packaging/utils.pyi

@@ -0,0 +1 @@
+from packaging.utils import *

pkg_resources/extern/packaging/version.pyi

@@ -0,0 +1 @@
+from packaging.version import *

pkg_resources/tests/test_pkg_resources.py

@@ -8,6 +8,7 @@
 import stat
 import distutils.dist
 import distutils.command.install_egg_info
+from typing import List
 
 from unittest import mock
 
@@ -42,7 +43,7 @@ def __call__(self):
 
 
 class TestZipProvider:
-    finalizers = []
+    finalizers: List[EggRemover] = []
 
     ref_time = datetime.datetime(2013, 5, 12, 13, 25, 0)
     "A reference time for a file modification"

pyproject.toml

@@ -11,3 +11,22 @@ extend_exclude = "_vendor"
 
 [tool.pytest-enabler.mypy]
 # disabled
+
+
+[tool.mypy]
+# CI should test for all versions, local development gets hints for oldest supported
+python_version = "3.8"
+strict = false
+# TODO: Not all dependencies are typed. setuptools itself should be typed too
+# TODO: Test environment is not yet properly configured to install all imported packages
+ignore_missing_imports = true
+# required to support namespace packages: https://github.com/python/mypy/issues/14057
+explicit_package_bases = true
+exclude = [
+	"^build/",
+	# Duplicate module name
+	"^pkg_resources/tests/data/my-test-package-source/setup.py$",
+	# Vendored
+	"^.+?/_vendor",
+	"^setuptools/_distutils",
+]

setup.cfg

@@ -49,7 +49,7 @@ testing =
 	pytest-cov; \
 		# coverage seems to make PyPy extremely slow
 		python_implementation != "PyPy"
-	pytest-mypy >= 0.9.1; \
+	pytest-mypy >= 0.10.3; \
 		# workaround for jaraco/skeleton#22
 		python_implementation != "PyPy"
 	pytest-enabler >= 2.2

setup.py

@@ -88,5 +88,6 @@ def _restore_install_lib(self):
 
 if __name__ == '__main__':
     # allow setup.py to run from another directory
-    here and os.chdir(here)
+    if here:
+        os.chdir(here)
     dist = setuptools.setup(**setup_params)

setuptools/__init__.py

@@ -113,7 +113,7 @@ def setup(**attrs):
 _Command = monkey.get_unpatched(distutils.core.Command)
 
 
-class Command(_Command):
+class Command(_Command):  # type: ignore[valid-type, misc]  # https://github.com/python/mypy/issues/14458
     """
     Setuptools internal actions are organized using a *command design pattern*.
     This means that each action (or group of closely related actions) executed during

setuptools/command/build_ext.py

@@ -3,29 +3,31 @@
 import itertools
 from importlib.machinery import EXTENSION_SUFFIXES
 from importlib.util import cache_from_source as _compiled_file_name
-from typing import Dict, Iterator, List, Tuple
+from typing import TYPE_CHECKING, Dict, Iterator, List, Tuple
 
-from distutils.command.build_ext import build_ext as _du_build_ext
 from distutils.ccompiler import new_compiler
 from distutils.sysconfig import customize_compiler, get_config_var
 from distutils import log
 
 from setuptools.errors import BaseError
 from setuptools.extension import Extension, Library
 
-try:
-    # Attempt to use Cython for building extensions, if available
-    from Cython.Distutils.build_ext import build_ext as _build_ext
+if TYPE_CHECKING:
+    from distutils.command.build_ext import build_ext as _build_ext
+else:
+    try:
+        # Attempt to use Cython for building extensions, if available
+        from Cython.Distutils.build_ext import build_ext as _build_ext
 
-    # Additionally, assert that the compiler module will load
-    # also. Ref #1229.
-    __import__('Cython.Compiler.Main')
-except ImportError:
-    _build_ext = _du_build_ext
+        # Additionally, assert that the compiler module will load
+        # also. Ref #1229.
+        __import__('Cython.Compiler.Main')
+    except ImportError:
+        from distutils.command.build_ext import build_ext as _build_ext
 
 # make sure _config_vars is initialized
 get_config_var("LDSHARED")
-from distutils.sysconfig import _config_vars as _CONFIG_VARS  # noqa
+from distutils.sysconfig import _config_vars as _CONFIG_VARS  # type: ignore # noqa # Not publicly exposed in distutils stubs
 
 
 def _customize_compiler_for_shlib(compiler):
@@ -126,7 +128,7 @@ def _get_output_mapping(self) -> Iterator[Tuple[str, str]]:
             return
 
         build_py = self.get_finalized_command('build_py')
-        opt = self.get_finalized_command('install_lib').optimize or ""
+        opt = self.get_finalized_command('install_lib').optimize or ""  # type: ignore[attr-defined] # TODO: Fix in distutils stubs
 
         for ext in self.extensions:
             inplace_file, regular_file = self._get_inplace_equivalent(build_py, ext)
@@ -296,7 +298,7 @@ def _write_stub_file(self, stub_file: str, ext: Extension, compile=False):
         log.info("writing stub loader for %s to %s", ext._full_name, stub_file)
         if compile and os.path.exists(stub_file):
             raise BaseError(stub_file + " already exists! Please delete.")
-        if not self.dry_run:
+        if not self.dry_run:  # type: ignore[attr-defined] # TODO: Fix in distutils stubs
             f = open(stub_file, 'w')
             f.write(
                 '\n'.join(
@@ -334,13 +336,13 @@ def _write_stub_file(self, stub_file: str, ext: Extension, compile=False):
     def _compile_and_remove_stub(self, stub_file: str):
         from distutils.util import byte_compile
 
-        byte_compile([stub_file], optimize=0, force=True, dry_run=self.dry_run)
-        optimize = self.get_finalized_command('install_lib').optimize
+        byte_compile([stub_file], optimize=0, force=True, dry_run=self.dry_run)  # type: ignore[attr-defined] # TODO: Fix in distutils stubs
+        optimize = self.get_finalized_command('install_lib').optimize  # type: ignore[attr-defined] # TODO: Fix in distutils stubs
         if optimize > 0:
             byte_compile(
-                [stub_file], optimize=optimize, force=True, dry_run=self.dry_run
+                [stub_file], optimize=optimize, force=True, dry_run=self.dry_run  # type: ignore[attr-defined] # TODO: Fix in distutils stubs
             )
-        if os.path.exists(stub_file) and not self.dry_run:
+        if os.path.exists(stub_file) and not self.dry_run:  # type: ignore[attr-defined] # TODO: Fix in distutils stubs
             os.unlink(stub_file)
 
 

setuptools/command/build_py.py

@@ -215,7 +215,7 @@ def _filter_build_files(self, files: Iterable[str], egg_info: str) -> Iterator[s
         This function should filter this case of invalid files out.
         """
         build = self.get_finalized_command("build")
-        build_dirs = (egg_info, self.build_lib, build.build_temp, build.build_base)
+        build_dirs = (egg_info, self.build_lib, build.build_temp, build.build_base)  # type: ignore[attr-defined] # TODO: Fix in distutils stubs
         norm_dirs = [os.path.normpath(p) for p in build_dirs if p]
 
         for file in files:

setuptools/command/easy_install.py

@@ -25,6 +25,7 @@
 from distutils.command import install
 import sys
 import os
+from typing import TYPE_CHECKING, Dict, List, Optional, Union
 import zipimport
 import shutil
 import tempfile
@@ -78,6 +79,8 @@
 from .._path import ensure_directory
 from ..extern.jaraco.text import yield_lines
 
+_FileDescriptorOrPath = Union[int, str, bytes, os.PathLike[str], os.PathLike[bytes]]
+
 
 # Turn on PEP440Warnings
 warnings.filterwarnings("default", category=pkg_resources.PEP440Warning)
@@ -1774,7 +1777,7 @@ def _wrap_lines(cls, lines):
 
 
 if os.environ.get('SETUPTOOLS_SYS_PATH_TECHNIQUE', 'raw') == 'rewrite':
-    PthDistributions = RewritePthDistributions
+    PthDistributions = RewritePthDistributions  # type: ignore[misc]  # Overwriting type
 
 
 def _first_line_re():
@@ -2024,7 +2027,13 @@ def is_python_script(script_text, filename):
     from os import chmod as _chmod
 except ImportError:
     # Jython compatibility
-    def _chmod(*args):
+    def _chmod(
+        path: _FileDescriptorOrPath,
+        mode: int,
+        *,
+        dir_fd: Optional[int] = None,
+        follow_symlinks: bool = True
+    ) -> None:
         pass
 
 
@@ -2042,8 +2051,8 @@ class CommandSpec(list):
     those passed to Popen.
     """
 
-    options = []
-    split_args = dict()
+    options: List[str] = []
+    split_args: Dict[str, bool] = dict()
 
     @classmethod
     def best(cls):

setuptools/command/rotate.py

@@ -3,6 +3,7 @@
 from distutils.errors import DistutilsOptionError
 import os
 import shutil
+from typing import List
 
 from setuptools import Command
 
@@ -17,7 +18,7 @@ class rotate(Command):
         ('keep=', 'k', "number of matching distributions to keep"),
     ]
 
-    boolean_options = []
+    boolean_options: List[str] = []
 
     def initialize_options(self):
         self.match = None
@@ -37,7 +38,8 @@ def finalize_options(self):
         except ValueError as e:
             raise DistutilsOptionError("--keep must be an integer") from e
         if isinstance(self.match, str):
-            self.match = [convert_path(p.strip()) for p in self.match.split(',')]
+            self.match = [convert_path(p.strip())
+                          for p in self.match.split(',')]
         self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
 
     def run(self):
@@ -52,7 +54,7 @@ def run(self):
             files.reverse()
 
             log.info("%d file(s) matching %s", len(files), pattern)
-            files = files[self.keep :]
+            files = files[self.keep:]
             for t, f in files:
                 log.info("Deleting %s", f)
                 if not self.dry_run:

setuptools/command/upload_docs.py

@@ -51,7 +51,7 @@ def has_sphinx(self):
             and metadata.entry_points(group='distutils.commands', name='build_sphinx')
         )
 
-    sub_commands = [('build_sphinx', has_sphinx)]
+    sub_commands = [('build_sphinx', has_sphinx)]  # type: ignore[list-item] # TODO: Fix in distutils stubs
 
     def initialize_options(self):
         upload.initialize_options(self)

setuptools/config/_validate_pyproject/__init__.py

@@ -5,7 +5,7 @@
 from .error_reporting import detailed_errors, ValidationError
 from .extra_validations import EXTRA_VALIDATIONS
 from .fastjsonschema_exceptions import JsonSchemaException, JsonSchemaValueException
-from .fastjsonschema_validations import validate as _validate
+from .fastjsonschema_validations import validate as _validate # type: ignore[attr-defined] # mypy false-positive. Pyright is fine here
 
 __all__ = [
     "validate",

setuptools/config/expand.py

@@ -64,7 +64,7 @@ class StaticModule:
     """Proxy to a module object that avoids executing arbitrary code."""
 
     def __init__(self, name: str, spec: ModuleSpec):
-        module = ast.parse(pathlib.Path(spec.origin).read_bytes())
+        module = ast.parse(pathlib.Path(spec.origin).read_bytes()) # type: ignore[arg-type] # Let it raise an error on None
         vars(self).update(locals())
         del self.self