Merge branch 'main' into TRY

Author: jaraco

.coveragerc

@@ -12,6 +12,8 @@ disable_warnings =
 [report]
 show_missing = True
 exclude_also =
-	# jaraco/skeleton#97
-	@overload
+	# Exclude common false positives per
+	# https://coverage.readthedocs.io/en/latest/excluding.html#advanced-exclusion
+	# Ref jaraco/skeleton#97 and jaraco/skeleton#135
+	class .*\bProtocol\):
 	if TYPE_CHECKING:

.pre-commit-config.yaml

@@ -1,6 +1,7 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.1.8
+  rev: v0.5.6
   hooks:
   - id: ruff
+    args: [--fix, --unsafe-fixes]
   - id: ruff-format

distutils/_modified.py

@@ -63,7 +63,7 @@ def missing_as_newer(source):
         return missing == 'newer' and not os.path.exists(source)
 
     ignored = os.path.exists if missing == 'ignore' else None
-    return any(
+    return not os.path.exists(target) or any(
         missing_as_newer(source) or _newer(source, target)
         for source in filter(ignored, sources)
     )

distutils/archive_util.py

@@ -266,8 +266,7 @@ def make_archive(
         raise ValueError(f"unknown archive format '{format}'")
 
     func = format_info[0]
-    for arg, val in format_info[1]:
-        kwargs[arg] = val
+    kwargs.update(format_info[1])
 
     if format != 'zip':
         kwargs['owner'] = owner

distutils/command/build_ext.py

@@ -638,8 +638,7 @@ def swig_sources(self, sources, extension):
 
         # Do not override commandline arguments
         if not self.swig_opts:
-            for o in extension.swig_opts:
-                swig_cmd.append(o)
+            swig_cmd.extend(extension.swig_opts)
 
         for source in swig_sources:
             target = swig_targets[source]

distutils/command/install.py

@@ -680,7 +680,7 @@ def create_home_path(self):
         if not self.user:
             return
         home = convert_path(os.path.expanduser("~"))
-        for _name, path in self.config_vars.items():
+        for path in self.config_vars.values():
             if str(path).startswith(home) and not os.path.isdir(path):
                 self.debug_print(f"os.makedirs('{path}', 0o700)")
                 os.makedirs(path, 0o700)

distutils/command/wininst-10.0-amd64.exe

@@ -172,8 +172,7 @@ def link(
 
             # Generate .def file
             contents = [f"LIBRARY {os.path.basename(output_filename)}", "EXPORTS"]
-            for sym in export_symbols:
-                contents.append(sym)
+            contents.extend(export_symbols)
             self.execute(write_file, (def_file, contents), f"writing {def_file}")
 
             # next add options for def-file

distutils/command/wininst-10.0.exe

@@ -10,17 +10,12 @@
 import pathlib
 import re
 import sys
+import warnings
 from collections.abc import Iterable
 from email import message_from_file
 
-from ._vendor.packaging.utils import canonicalize_name, canonicalize_version
-
-try:
-    import warnings
-except ImportError:
-    warnings = None
-
 from ._log import log
+from ._vendor.packaging.utils import canonicalize_name, canonicalize_version
 from .debug import DEBUG
 from .errors import (
     DistutilsArgError,
@@ -249,10 +244,7 @@ def __init__(self, attrs=None):  # noqa: C901
                 attrs['license'] = attrs['licence']
                 del attrs['licence']
                 msg = "'licence' distribution option is deprecated; use 'license'"
-                if warnings is not None:
-                    warnings.warn(msg)
-                else:
-                    sys.stderr.write(msg + "\n")
+                warnings.warn(msg)
 
             # Now work on the rest of the attributes.  Any attribute that's
             # not already defined is invalid!
@@ -354,7 +346,8 @@ def _gen_paths(self):
         prefix = '.' * (os.name == 'posix')
         filename = prefix + 'pydistutils.cfg'
         if self.want_user_cfg:
-            yield pathlib.Path('~').expanduser() / filename
+            with contextlib.suppress(RuntimeError):
+                yield pathlib.Path('~').expanduser() / filename
 
         # All platforms support local setup.cfg
         yield pathlib.Path('setup.cfg')
@@ -658,7 +651,7 @@ def _show_help(
             )
             print()
 
-        for command in self.commands:
+        for command in commands:
             if isinstance(command, type) and issubclass(command, Command):
                 klass = command
             else:
@@ -741,9 +734,7 @@ def print_commands(self):
         import distutils.command
 
         std_commands = distutils.command.__all__
-        is_std = set()
-        for cmd in std_commands:
-            is_std.add(cmd)
+        is_std = set(std_commands)
 
         extra_commands = [cmd for cmd in self.cmdclass.keys() if cmd not in is_std]
 
@@ -769,9 +760,7 @@ def get_command_list(self):
         import distutils.command
 
         std_commands = distutils.command.__all__
-        is_std = set()
-        for cmd in std_commands:
-            is_std.add(cmd)
+        is_std = set(std_commands)
 
         extra_commands = [cmd for cmd in self.cmdclass.keys() if cmd not in is_std]
 

distutils/command/wininst-14.0-amd64.exe

@@ -117,3 +117,10 @@ def test_newer_pairwise_group(groups_target):
     newer = newer_pairwise_group([groups_target.newer], [groups_target.target])
     assert older == ([], [])
     assert newer == ([groups_target.newer], [groups_target.target])
+
+
+def test_newer_group_no_sources_no_target(tmp_path):
+    """
+    Consider no sources and no target "newer".
+    """
+    assert newer_group([], str(tmp_path / 'does-not-exist'))

distutils/command/wininst-14.0.exe

@@ -1,5 +1,14 @@
 [mypy]
-ignore_missing_imports = True
-# required to support namespace packages
-# https://github.com/python/mypy/issues/14057
+# Is the project well-typed?
+strict = False
+
+# Early opt-in even when strict = False
+warn_unused_ignores = True
+warn_redundant_casts = True
+enable_error_code = ignore-without-code
+
+# Support namespace packages per https://github.com/python/mypy/issues/14057
 explicit_package_bases = True
+
+# Disable overload-overlap due to many false-positives
+disable_error_code = overload-overlap

distutils/command/wininst-6.0.exe

@@ -27,11 +27,6 @@ Source = "https://github.com/pypa/distutils"
 test = [
 	# upstream
 	"pytest >= 6, != 8.1.*",
-	"pytest-checkdocs >= 2.4",
-	"pytest-cov",
-	"pytest-mypy",
-	"pytest-enabler >= 2.2",
-	"pytest-ruff >= 0.2.1; sys_platform != 'cygwin'",
 
 	# local
 	"pytest >= 7.4.3", # 186
@@ -46,6 +41,7 @@ test = [
 	# workaround for pytest-dev/pytest#12490
 	"pytest < 8.1; python_version < '3.12'",
 ]
+
 doc = [
 	# upstream
 	"sphinx >= 3.5",
@@ -57,7 +53,30 @@ doc = [
 	# local
 ]
 
+check = [
+	"pytest-checkdocs >= 2.4",
+	"pytest-ruff >= 0.2.1; sys_platform != 'cygwin'",
+]
+
+cover = [
+	"pytest-cov",
+]
+
+enabler = [
+	"pytest-enabler >= 2.2",
+]
+
+type = [
+	# upstream
+	"pytest-mypy",
+
+	# local
+]
+
+
 [tool.setuptools_scm]
 
+
 [tool.pytest-enabler.mypy]
-# disabled
+# Disabled due to jaraco/skeleton#143
+# Disabled as distutils isn't ready yet

distutils/command/wininst-7.1.exe

@@ -5,15 +5,21 @@ extend-select = [
 	"W",
 
 	# local
+	"B",
+	"I",
 	"ISC",
+	"PERF",
 	"RUF010",
 	"RUF100",
 	"TRY",
 	"UP",
 ]
 ignore = [
+	# local
+	"PERF203",
 	"TRY003",
-	# https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
+
+  # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
 	"W191",
 	"E111",
 	"E114",
@@ -28,6 +34,10 @@ ignore = [
 	"COM819",
 	"ISC001",
 	"ISC002",
+
+	# local
+	"B028",
+	"B904",
 ]
 
 [format]

distutils/command/wininst-8.0.exe

@@ -12,6 +12,10 @@ commands =
 usedevelop = True
 extras =
 	test
+	check
+	cover
+	enabler
+	type
 
 [testenv:diffcov]
 description = run tests and check that diff from main is covered