Resolve conflicts with #354

Author: jaraco

distutils/command/build.py

@@ -136,16 +136,16 @@ def run(self) -> None:
 
     # -- Predicates for the sub-command list ---------------------------
 
-    def has_pure_modules(self):
+    def has_pure_modules(self) -> bool:
         return self.distribution.has_pure_modules()
 
-    def has_c_libraries(self):
+    def has_c_libraries(self) -> bool:
         return self.distribution.has_c_libraries()
 
-    def has_ext_modules(self):
+    def has_ext_modules(self) -> bool:
         return self.distribution.has_ext_modules()
 
-    def has_scripts(self):
+    def has_scripts(self) -> bool:
         return self.distribution.has_scripts()
 
     sub_commands = [

distutils/command/install.py

@@ -264,12 +264,12 @@ def initialize_options(self) -> None:
         # supplied by the user, they are filled in using the installation
         # scheme implied by prefix/exec-prefix/home and the contents of
         # that installation scheme.
-        self.install_purelib = None  # for pure module distributions
-        self.install_platlib = None  # non-pure (dists w/ extensions)
-        self.install_headers = None  # for C/C++ headers
+        self.install_purelib: str | None = None  # for pure module distributions
+        self.install_platlib: str | None = None  # non-pure (dists w/ extensions)
+        self.install_headers: str | None = None  # for C/C++ headers
         self.install_lib: str | None = None  # set to either purelib or platlib
-        self.install_scripts = None
-        self.install_data = None
+        self.install_scripts: str | None = None
+        self.install_data: str | None = None
         self.install_userbase = USER_BASE
         self.install_usersite = USER_SITE
 
@@ -772,24 +772,24 @@ def get_inputs(self):
 
     # -- Predicates for sub-command list -------------------------------
 
-    def has_lib(self):
+    def has_lib(self) -> bool:
         """Returns true if the current distribution has any Python
         modules to install."""
         return (
             self.distribution.has_pure_modules() or self.distribution.has_ext_modules()
         )
 
-    def has_headers(self):
+    def has_headers(self) -> bool:
         """Returns true if the current distribution has any headers to
         install."""
         return self.distribution.has_headers()
 
-    def has_scripts(self):
+    def has_scripts(self) -> bool:
         """Returns true if the current distribution has any scripts to.
         install."""
         return self.distribution.has_scripts()
 
-    def has_data(self):
+    def has_data(self) -> bool:
         """Returns true if the current distribution has any data to.
         install."""
         return self.distribution.has_data_files()

distutils/compilers/C/cygwin.py

@@ -6,6 +6,8 @@
 cygwin in no-cygwin mode).
 """
 
+from __future__ import annotations
+
 import copy
 import os
 import pathlib
@@ -327,7 +329,7 @@ def check_config_h():
         return code, f"{fn!r} {mention_inflected} {substring!r}"
 
 
-def is_cygwincc(cc):
+def is_cygwincc(cc: str | shlex._ShlexInstream) -> bool:
     """Try to determine if the compiler that would be used is from cygwin."""
     out_string = check_output(shlex.split(cc) + ['-dumpmachine'])
     return out_string.strip().endswith(b'cygwin')

distutils/dist.py

@@ -45,6 +45,7 @@
 
     # type-only import because of mutual dependence between these modules
     from .cmd import Command
+    from .extension import Extension
 
 _CommandT = TypeVar("_CommandT", bound="Command")
 _OptionsList: TypeAlias = list[
@@ -220,18 +221,18 @@ def __init__(self, attrs: MutableMapping[str, Any] | None = None) -> None:  # no
         # These options are really the business of various commands, rather
         # than of the Distribution itself.  We provide aliases for them in
         # Distribution as a convenience to the developer.
-        self.packages = None
+        self.packages: list[str] | None = None
         self.package_data: dict[str, list[str]] = {}
-        self.package_dir = None
-        self.py_modules = None
+        self.package_dir: dict[str, str] | None = None
+        self.py_modules: list[str] | None = None
         self.libraries = None
         self.headers = None
-        self.ext_modules = None
+        self.ext_modules: list[Extension] | None = None
         self.ext_package = None
         self.include_dirs = None
         self.extra_path = None
         self.scripts = None
-        self.data_files = None
+        self.data_files: list[str | tuple] | None = None
         self.password = ''
 
         # And now initialize bookkeeping stuff that can't be supplied by
@@ -1024,25 +1025,25 @@ def run_command(self, command: str) -> None:
     # -- Distribution query methods ------------------------------------
 
     def has_pure_modules(self) -> bool:
-        return len(self.packages or self.py_modules or []) > 0
+        return bool(self.packages or self.py_modules)
 
     def has_ext_modules(self) -> bool:
-        return self.ext_modules and len(self.ext_modules) > 0
+        return bool(self.ext_modules)
 
     def has_c_libraries(self) -> bool:
-        return self.libraries and len(self.libraries) > 0
+        return bool(self.libraries)
 
     def has_modules(self) -> bool:
         return self.has_pure_modules() or self.has_ext_modules()
 
     def has_headers(self) -> bool:
-        return self.headers and len(self.headers) > 0
+        return bool(self.headers)
 
     def has_scripts(self) -> bool:
-        return self.scripts and len(self.scripts) > 0
+        return bool(self.scripts)
 
     def has_data_files(self) -> bool:
-        return self.data_files and len(self.data_files) > 0
+        return bool(self.data_files)
 
     def is_pure(self) -> bool:
         return (

distutils/fancy_getopt.py

@@ -105,7 +105,7 @@ def add_option(self, long_option, short_option=None, help_string=None):
             self.option_table.append(option)
             self.option_index[long_option] = option
 
-    def has_option(self, long_option):
+    def has_option(self, long_option: str) -> bool:
         """Return true if the option table for this parser has an
         option with long name 'long_option'."""
         return long_option in self.option_index

distutils/tests/test_check.py

@@ -126,7 +126,6 @@ def test_check_author_maintainer(self):
             assert cmd._warnings == 0
 
     def test_check_document(self):
-        pytest.importorskip('docutils')
         pkg_info, dist = self.create_dist()
         cmd = _check.check(dist)
 
@@ -141,7 +140,6 @@ def test_check_document(self):
         assert len(msgs) == 0
 
     def test_check_restructuredtext(self):
-        pytest.importorskip('docutils')
         # let's see if it detects broken rest in long_description
         broken_rest = 'title\n===\n\ntest'
         pkg_info, dist = self.create_dist(long_description=broken_rest)

distutils/util.py

@@ -513,6 +513,6 @@ def is_mingw() -> bool:
     return sys.platform == 'win32' and get_platform().startswith('mingw')
 
 
-def is_freethreaded():
+def is_freethreaded() -> bool:
     """Return True if the Python interpreter is built with free threading support."""
     return bool(sysconfig.get_config_var('Py_GIL_DISABLED'))

mypy.ini

@@ -31,11 +31,6 @@ disable_error_code =
 	misc,
 	has-type,
 
-# Is only imported in a test and doesn't seem relevant.
-# TODO: Should we add types-pygments or remove from the test?
-[mypy-pygments.*]
-ignore_missing_imports = True
-
 # stdlib's test module is not typed on typeshed
 [mypy-test.*]
 ignore_missing_imports = True

pyproject.toml

@@ -34,15 +34,15 @@ test = [
 	"pytest >= 6, != 8.1.*",
 
 	# local
-	"pytest >= 7.4.3", # 186
+	"pytest >= 7.4.3", # pypa/distutils#186
 	"jaraco.envs>=2.4",
 	"jaraco.path",
 	"jaraco.text",
 	"path >= 10.6",
 	"docutils",
+	"Pygments",
 	"pyfakefs",
 	"more_itertools",
-	"pygments",
 
 	# workaround for pytest-dev/pytest#12490
 	"pytest < 8.1; python_version < '3.12'",