From 5a8ca1b0f362968a29f2fb9c107cc0d4d79c3263 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Jul 2023 18:20:05 -0400
Subject: [PATCH 01/26] Rely on pytest as found in pytest-dev/pytest#11155.
 Fixes pypa/distutils#186.

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index c42004831a..06657e4eaa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,8 @@ toxworkdir={env:TOX_WORK_DIR:.tox}
 
 [testenv]
 deps =
-	# < 7.2 due to pypa/distutils#186
-	pytest < 7.2
+	# pypa/distutils#186; workaround for pytest-dev/pytest#10447
+	pytest @ git+https://github.com/RonnyPfannschmidt/pytest@fix-10447-maker-mro-order-needs-reverse
 
 	pytest-flake8
 	# workaround for tholo/pytest-flake8#87

From 4a7033164d5bd4fe7ee4d96dae1c0cbfb122df9e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Nov 2023 11:45:37 -0400
Subject: [PATCH 02/26] Clean up docstrings and remove crufty comments. Replace
 integer literals with booleans.

---
 distutils/dep_util.py | 91 ++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 48 deletions(-)

diff --git a/distutils/dep_util.py b/distutils/dep_util.py
index 48da8641c6..3b3c830c13 100644
--- a/distutils/dep_util.py
+++ b/distutils/dep_util.py
@@ -1,45 +1,45 @@
-"""distutils.dep_util
+"""Timestamp comparison of files and groups of files."""
 
-Utility functions for simple, timestamp-based dependency of files
-and groups of files; also, function based entirely on such
-timestamp dependency analysis."""
+import os.path
+import stat
 
-import os
 from .errors import DistutilsFileError
 
 
 def newer(source, target):
-    """Return true if 'source' exists and is more recently modified than
-    'target', or if 'source' exists and 'target' doesn't.  Return false if
-    both exist and 'target' is the same age or younger than 'source'.
-    Raise DistutilsFileError if 'source' does not exist.
+    """
+    Is source modified more recently than target.
+
+    Returns True if 'source' is modified more recently than
+    'target' or if 'target' does not exist.
+
+    Raises DistutilsFileError if 'source' does not exist.
     """
     if not os.path.exists(source):
         raise DistutilsFileError("file '%s' does not exist" % os.path.abspath(source))
-    if not os.path.exists(target):
-        return 1
 
-    from stat import ST_MTIME
+    if not os.path.exists(target):
+        return True
 
-    mtime1 = os.stat(source)[ST_MTIME]
-    mtime2 = os.stat(target)[ST_MTIME]
+    mtime1 = os.stat(source)[stat.ST_MTIME]
+    mtime2 = os.stat(target)[stat.ST_MTIME]
 
     return mtime1 > mtime2
 
 
-# newer ()
-
-
 def newer_pairwise(sources, targets):
-    """Walk two filename lists in parallel, testing if each source is newer
-    than its corresponding target.  Return a pair of lists (sources,
+    """
+    Filter filenames where sources are newer than targets.
+
+    Walk two filename lists in parallel, testing if each source is newer
+    than its corresponding target.  Returns a pair of lists (sources,
     targets) where source is newer than target, according to the semantics
     of 'newer()'.
     """
     if len(sources) != len(targets):
         raise ValueError("'sources' and 'targets' must be same length")
 
-    # build a pair of lists (sources, targets) where  source is newer
+    # build a pair of lists (sources, targets) where source is newer
     n_sources = []
     n_targets = []
     for i in range(len(sources)):
@@ -50,33 +50,31 @@ def newer_pairwise(sources, targets):
     return (n_sources, n_targets)
 
 
-# newer_pairwise ()
-
-
 def newer_group(sources, target, missing='error'):
-    """Return true if 'target' is out-of-date with respect to any file
-    listed in 'sources'.  In other words, if 'target' exists and is newer
-    than every file in 'sources', return false; otherwise return true.
-    'missing' controls what we do when a source file is missing; the
-    default ("error") is to blow up with an OSError from inside 'stat()';
-    if it is "ignore", we silently drop any missing source files; if it is
-    "newer", any missing source files make us assume that 'target' is
-    out-of-date (this is handy in "dry-run" mode: it'll make you pretend to
-    carry out commands that wouldn't work because inputs are missing, but
-    that doesn't matter because you're not actually going to run the
-    commands).
+    """
+    Is target out-of-date with respect to any file in sources.
+
+    Return True if 'target' is out-of-date with respect to any file
+    listed in 'sources'. In other words, if 'target' exists and is newer
+    than every file in 'sources', return False; otherwise return True.
+    ``missing`` controls how to handle a missing source file:
+
+    - error (default): allow the ``stat()`` call to fail.
+    - ignore: silently disregard any missing source files.
+    - newer: treat missing source files as "target out of date". This
+      mode is handy in "dry-run" mode: it will pretend to carry out
+      commands that wouldn't work because inputs are missing, but
+      that doesn't matter because dry-run won't run the commands.
     """
     # If the target doesn't even exist, then it's definitely out-of-date.
     if not os.path.exists(target):
-        return 1
+        return True
 
-    # Otherwise we have to find out the hard way: if *any* source file
+    # If *any* source file
     # is more recent than 'target', then 'target' is out-of-date and
-    # we can immediately return true.  If we fall through to the end
-    # of the loop, then 'target' is up-to-date and we return false.
-    from stat import ST_MTIME
-
-    target_mtime = os.stat(target)[ST_MTIME]
+    # we can immediately return True. If the loop completes, then
+    # 'target' is up-to-date.
+    target_mtime = os.stat(target)[stat.ST_MTIME]
     for source in sources:
         if not os.path.exists(source):
             if missing == 'error':  # blow up when we stat() the file
@@ -84,13 +82,10 @@ def newer_group(sources, target, missing='error'):
             elif missing == 'ignore':  # missing source dropped from
                 continue  # target's dependency list
             elif missing == 'newer':  # missing source means target is
-                return 1  # out-of-date
+                return True  # out-of-date
 
-        source_mtime = os.stat(source)[ST_MTIME]
+        source_mtime = os.stat(source)[stat.ST_MTIME]
         if source_mtime > target_mtime:
-            return 1
+            return True
     else:
-        return 0
-
-
-# newer_group ()
+        return False

From c4e27db944fc8ef08b215e593bbd328ce17bfff5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Nov 2023 12:35:52 -0400
Subject: [PATCH 03/26] "Refactor to newer_group to utilize higher level
 constructs ("any"), re-use _newer logic, and avoid complexity in branching."

---
 distutils/dep_util.py | 48 +++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/distutils/dep_util.py b/distutils/dep_util.py
index 3b3c830c13..9250e937a1 100644
--- a/distutils/dep_util.py
+++ b/distutils/dep_util.py
@@ -6,6 +6,16 @@
 from .errors import DistutilsFileError
 
 
+def _newer(source, target):
+    if not os.path.exists(target):
+        return True
+
+    mtime1 = os.stat(source)[stat.ST_MTIME]
+    mtime2 = os.stat(target)[stat.ST_MTIME]
+
+    return mtime1 > mtime2
+
+
 def newer(source, target):
     """
     Is source modified more recently than target.
@@ -18,13 +28,7 @@ def newer(source, target):
     if not os.path.exists(source):
         raise DistutilsFileError("file '%s' does not exist" % os.path.abspath(source))
 
-    if not os.path.exists(target):
-        return True
-
-    mtime1 = os.stat(source)[stat.ST_MTIME]
-    mtime2 = os.stat(target)[stat.ST_MTIME]
-
-    return mtime1 > mtime2
+    return _newer(source, target)
 
 
 def newer_pairwise(sources, targets):
@@ -66,26 +70,12 @@ def newer_group(sources, target, missing='error'):
       commands that wouldn't work because inputs are missing, but
       that doesn't matter because dry-run won't run the commands.
     """
-    # If the target doesn't even exist, then it's definitely out-of-date.
-    if not os.path.exists(target):
-        return True
 
-    # If *any* source file
-    # is more recent than 'target', then 'target' is out-of-date and
-    # we can immediately return True. If the loop completes, then
-    # 'target' is up-to-date.
-    target_mtime = os.stat(target)[stat.ST_MTIME]
-    for source in sources:
-        if not os.path.exists(source):
-            if missing == 'error':  # blow up when we stat() the file
-                pass
-            elif missing == 'ignore':  # missing source dropped from
-                continue  # target's dependency list
-            elif missing == 'newer':  # missing source means target is
-                return True  # out-of-date
-
-        source_mtime = os.stat(source)[stat.ST_MTIME]
-        if source_mtime > target_mtime:
-            return True
-    else:
-        return False
+    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(
+        missing_as_newer(source) or _newer(source, target)
+        for source in filter(ignored, sources)
+    )

From d7aa1884989cb8e57382553d4c39b7e2a48b12f8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Nov 2023 12:38:06 -0400
Subject: [PATCH 04/26] Prefer os.path.getmtime

---
 distutils/dep_util.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/distutils/dep_util.py b/distutils/dep_util.py
index 9250e937a1..f4f006c728 100644
--- a/distutils/dep_util.py
+++ b/distutils/dep_util.py
@@ -1,7 +1,6 @@
 """Timestamp comparison of files and groups of files."""
 
 import os.path
-import stat
 
 from .errors import DistutilsFileError
 
@@ -10,10 +9,7 @@ def _newer(source, target):
     if not os.path.exists(target):
         return True
 
-    mtime1 = os.stat(source)[stat.ST_MTIME]
-    mtime2 = os.stat(target)[stat.ST_MTIME]
-
-    return mtime1 > mtime2
+    return os.path.getmtime(source) > os.path.getmtime(target)
 
 
 def newer(source, target):

From dfc8e609c9ca359d2c73815af511c2f286d3a92c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Nov 2023 12:38:57 -0400
Subject: [PATCH 05/26] Inline check for target presence.

---
 distutils/dep_util.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/distutils/dep_util.py b/distutils/dep_util.py
index f4f006c728..eec76c3c1e 100644
--- a/distutils/dep_util.py
+++ b/distutils/dep_util.py
@@ -6,10 +6,9 @@
 
 
 def _newer(source, target):
-    if not os.path.exists(target):
-        return True
-
-    return os.path.getmtime(source) > os.path.getmtime(target)
+    return not os.path.exists(target) or (
+        os.path.getmtime(source) > os.path.getmtime(target)
+    )
 
 
 def newer(source, target):

From bdffb48680406e6a8033f35cc68b061f7765d2be Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Nov 2023 12:59:15 -0400
Subject: [PATCH 06/26] Add test for newer_pairwise, bringing coverage in
 dep_util to 100%.

---
 distutils/tests/test_dep_util.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/distutils/tests/test_dep_util.py b/distutils/tests/test_dep_util.py
index e5dcad9464..759772d2b9 100644
--- a/distutils/tests/test_dep_util.py
+++ b/distutils/tests/test_dep_util.py
@@ -27,7 +27,7 @@ def test_newer(self):
         # than 'new_file'.
         assert not newer(old_file, new_file)
 
-    def test_newer_pairwise(self):
+    def _setup_1234(self):
         tmpdir = self.mkdtemp()
         sources = os.path.join(tmpdir, 'sources')
         targets = os.path.join(tmpdir, 'targets')
@@ -40,9 +40,22 @@ def test_newer_pairwise(self):
         self.write_file(one)
         self.write_file(two)
         self.write_file(four)
+        return one, two, three, four
+
+    def test_newer_pairwise(self):
+        one, two, three, four = self._setup_1234()
 
         assert newer_pairwise([one, two], [three, four]) == ([one], [three])
 
+    def test_newer_pairwise_mismatch(self):
+        one, two, three, four = self._setup_1234()
+
+        with pytest.raises(ValueError):
+            newer_pairwise([one], [three, four])
+
+        with pytest.raises(ValueError):
+            newer_pairwise([one, two], [three])
+
     def test_newer_group(self):
         tmpdir = self.mkdtemp()
         sources = os.path.join(tmpdir, 'sources')

From 0720b98908e0a6143c4fe260f3b154cf4426c8bc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Nov 2023 13:07:05 -0400
Subject: [PATCH 07/26] Replace for/append loop with a filter function
 (newer_pair).

---
 distutils/dep_util.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/distutils/dep_util.py b/distutils/dep_util.py
index eec76c3c1e..18aeae462f 100644
--- a/distutils/dep_util.py
+++ b/distutils/dep_util.py
@@ -38,15 +38,11 @@ def newer_pairwise(sources, targets):
     if len(sources) != len(targets):
         raise ValueError("'sources' and 'targets' must be same length")
 
-    # build a pair of lists (sources, targets) where source is newer
-    n_sources = []
-    n_targets = []
-    for i in range(len(sources)):
-        if newer(sources[i], targets[i]):
-            n_sources.append(sources[i])
-            n_targets.append(targets[i])
-
-    return (n_sources, n_targets)
+    def newer_pair(pair):
+        return newer(*pair)
+
+    newer_pairs = filter(newer_pair, zip(sources, targets))
+    return tuple(map(list, zip(*newer_pairs)))
 
 
 def newer_group(sources, target, missing='error'):

From 131eff757c51fa8781404a8f1d46c358804a0ce7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Nov 2023 13:14:24 -0400
Subject: [PATCH 08/26] Replace explicit list check with zip(strict=True).
 Allows inputs to be iterables.

---
 distutils/dep_util.py   |  7 +++----
 distutils/py39compat.py | 46 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/distutils/dep_util.py b/distutils/dep_util.py
index 18aeae462f..d8538b5001 100644
--- a/distutils/dep_util.py
+++ b/distutils/dep_util.py
@@ -3,6 +3,7 @@
 import os.path
 
 from .errors import DistutilsFileError
+from .py39compat import zip_strict
 
 
 def _newer(source, target):
@@ -30,18 +31,16 @@ def newer_pairwise(sources, targets):
     """
     Filter filenames where sources are newer than targets.
 
-    Walk two filename lists in parallel, testing if each source is newer
+    Walk two filename iterables in parallel, testing if each source is newer
     than its corresponding target.  Returns a pair of lists (sources,
     targets) where source is newer than target, according to the semantics
     of 'newer()'.
     """
-    if len(sources) != len(targets):
-        raise ValueError("'sources' and 'targets' must be same length")
 
     def newer_pair(pair):
         return newer(*pair)
 
-    newer_pairs = filter(newer_pair, zip(sources, targets))
+    newer_pairs = filter(newer_pair, zip_strict(sources, targets))
     return tuple(map(list, zip(*newer_pairs)))
 
 
diff --git a/distutils/py39compat.py b/distutils/py39compat.py
index c43e5f10fd..1b436d7658 100644
--- a/distutils/py39compat.py
+++ b/distutils/py39compat.py
@@ -1,5 +1,7 @@
-import sys
+import functools
+import itertools
 import platform
+import sys
 
 
 def add_ext_suffix_39(vars):
@@ -20,3 +22,45 @@ def add_ext_suffix_39(vars):
 
 needs_ext_suffix = sys.version_info < (3, 10) and platform.system() == 'Windows'
 add_ext_suffix = add_ext_suffix_39 if needs_ext_suffix else lambda vars: None
+
+
+# from more_itertools
+class UnequalIterablesError(ValueError):
+    def __init__(self, details=None):
+        msg = 'Iterables have different lengths'
+        if details is not None:
+            msg += (': index 0 has length {}; index {} has length {}').format(*details)
+
+        super().__init__(msg)
+
+
+# from more_itertools
+def _zip_equal_generator(iterables):
+    _marker = object()
+    for combo in itertools.zip_longest(*iterables, fillvalue=_marker):
+        for val in combo:
+            if val is _marker:
+                raise UnequalIterablesError()
+        yield combo
+
+
+# from more_itertools
+def _zip_equal(*iterables):
+    # Check whether the iterables are all the same size.
+    try:
+        first_size = len(iterables[0])
+        for i, it in enumerate(iterables[1:], 1):
+            size = len(it)
+            if size != first_size:
+                raise UnequalIterablesError(details=(first_size, i, size))
+        # All sizes are equal, we can use the built-in zip.
+        return zip(*iterables)
+    # If any one of the iterables didn't have a length, start reading
+    # them until one runs out.
+    except TypeError:
+        return _zip_equal_generator(iterables)
+
+
+zip_strict = (
+    _zip_equal if sys.version_info < (3, 10) else functools.partial(zip, strict=True)
+)

From 4d82dc4a053c7e8b7a5720b5a4db7da2ca2ea912 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Nov 2023 13:24:00 -0400
Subject: [PATCH 09/26] Extract a 'starfilter', similar to itertools.starmap,
 to generalize the concept of filtering results over a sequence of tuples.

---
 distutils/dep_util.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/distutils/dep_util.py b/distutils/dep_util.py
index d8538b5001..c1ae3297e8 100644
--- a/distutils/dep_util.py
+++ b/distutils/dep_util.py
@@ -27,6 +27,13 @@ def newer(source, target):
     return _newer(source, target)
 
 
+def _starfilter(pred, iterables):
+    """
+    Like itertools.starmap but for filter.
+    """
+    return filter(lambda x: pred(*x), iterables)
+
+
 def newer_pairwise(sources, targets):
     """
     Filter filenames where sources are newer than targets.
@@ -36,11 +43,7 @@ def newer_pairwise(sources, targets):
     targets) where source is newer than target, according to the semantics
     of 'newer()'.
     """
-
-    def newer_pair(pair):
-        return newer(*pair)
-
-    newer_pairs = filter(newer_pair, zip_strict(sources, targets))
+    newer_pairs = _starfilter(newer, zip_strict(sources, targets))
     return tuple(map(list, zip(*newer_pairs)))
 
 

From 5deb5ac17329a44b720c55b9f006858607cfbb3f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Nov 2023 21:47:23 -0400
Subject: [PATCH 10/26] Replace '_starfilter' with 'jaraco.functools.splat'.

---
 distutils/_functools.py | 53 +++++++++++++++++++++++++++++++++++++++++
 distutils/dep_util.py   | 10 ++------
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/distutils/_functools.py b/distutils/_functools.py
index e7053bac12..e03365eafa 100644
--- a/distutils/_functools.py
+++ b/distutils/_functools.py
@@ -1,3 +1,4 @@
+import collections.abc
 import functools
 
 
@@ -18,3 +19,55 @@ def wrapper(param, *args, **kwargs):
             return func(param, *args, **kwargs)
 
     return wrapper
+
+
+# from jaraco.functools 4.0
+@functools.singledispatch
+def _splat_inner(args, func):
+    """Splat args to func."""
+    return func(*args)
+
+
+@_splat_inner.register
+def _(args: collections.abc.Mapping, func):
+    """Splat kargs to func as kwargs."""
+    return func(**args)
+
+
+def splat(func):
+    """
+    Wrap func to expect its parameters to be passed positionally in a tuple.
+
+    Has a similar effect to that of ``itertools.starmap`` over
+    simple ``map``.
+
+    >>> import itertools, operator
+    >>> pairs = [(-1, 1), (0, 2)]
+    >>> _ = tuple(itertools.starmap(print, pairs))
+    -1 1
+    0 2
+    >>> _ = tuple(map(splat(print), pairs))
+    -1 1
+    0 2
+
+    The approach generalizes to other iterators that don't have a "star"
+    equivalent, such as a "starfilter".
+
+    >>> list(filter(splat(operator.add), pairs))
+    [(0, 2)]
+
+    Splat also accepts a mapping argument.
+
+    >>> def is_nice(msg, code):
+    ...     return "smile" in msg or code == 0
+    >>> msgs = [
+    ...     dict(msg='smile!', code=20),
+    ...     dict(msg='error :(', code=1),
+    ...     dict(msg='unknown', code=0),
+    ... ]
+    >>> for msg in filter(splat(is_nice), msgs):
+    ...     print(msg)
+    {'msg': 'smile!', 'code': 20}
+    {'msg': 'unknown', 'code': 0}
+    """
+    return functools.wraps(func)(functools.partial(_splat_inner, func=func))
diff --git a/distutils/dep_util.py b/distutils/dep_util.py
index c1ae3297e8..18a4f2b224 100644
--- a/distutils/dep_util.py
+++ b/distutils/dep_util.py
@@ -4,6 +4,7 @@
 
 from .errors import DistutilsFileError
 from .py39compat import zip_strict
+from ._functools import splat
 
 
 def _newer(source, target):
@@ -27,13 +28,6 @@ def newer(source, target):
     return _newer(source, target)
 
 
-def _starfilter(pred, iterables):
-    """
-    Like itertools.starmap but for filter.
-    """
-    return filter(lambda x: pred(*x), iterables)
-
-
 def newer_pairwise(sources, targets):
     """
     Filter filenames where sources are newer than targets.
@@ -43,7 +37,7 @@ def newer_pairwise(sources, targets):
     targets) where source is newer than target, according to the semantics
     of 'newer()'.
     """
-    newer_pairs = _starfilter(newer, zip_strict(sources, targets))
+    newer_pairs = filter(splat(newer), zip_strict(sources, targets))
     return tuple(map(list, zip(*newer_pairs)))
 
 

From 94942032878d431cee55adaab12a8bd83549a833 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Nov 2023 05:59:02 -0500
Subject: [PATCH 11/26] Move dep_util to _modified and mark dep_util as
 deprecated.

---
 distutils/_modified.py                        | 68 +++++++++++++++++
 distutils/bcppcompiler.py                     |  2 +-
 distutils/ccompiler.py                        |  2 +-
 distutils/cmd.py                              |  4 +-
 distutils/command/build_ext.py                |  2 +-
 distutils/command/build_scripts.py            |  2 +-
 distutils/dep_util.py                         | 74 +++----------------
 distutils/file_util.py                        |  2 +-
 .../{test_dep_util.py => test_modified.py}    |  4 +-
 distutils/unixccompiler.py                    |  2 +-
 distutils/util.py                             |  2 +-
 11 files changed, 89 insertions(+), 75 deletions(-)
 create mode 100644 distutils/_modified.py
 rename distutils/tests/{test_dep_util.py => test_modified.py} (96%)

diff --git a/distutils/_modified.py b/distutils/_modified.py
new file mode 100644
index 0000000000..18a4f2b224
--- /dev/null
+++ b/distutils/_modified.py
@@ -0,0 +1,68 @@
+"""Timestamp comparison of files and groups of files."""
+
+import os.path
+
+from .errors import DistutilsFileError
+from .py39compat import zip_strict
+from ._functools import splat
+
+
+def _newer(source, target):
+    return not os.path.exists(target) or (
+        os.path.getmtime(source) > os.path.getmtime(target)
+    )
+
+
+def newer(source, target):
+    """
+    Is source modified more recently than target.
+
+    Returns True if 'source' is modified more recently than
+    'target' or if 'target' does not exist.
+
+    Raises DistutilsFileError if 'source' does not exist.
+    """
+    if not os.path.exists(source):
+        raise DistutilsFileError("file '%s' does not exist" % os.path.abspath(source))
+
+    return _newer(source, target)
+
+
+def newer_pairwise(sources, targets):
+    """
+    Filter filenames where sources are newer than targets.
+
+    Walk two filename iterables in parallel, testing if each source is newer
+    than its corresponding target.  Returns a pair of lists (sources,
+    targets) where source is newer than target, according to the semantics
+    of 'newer()'.
+    """
+    newer_pairs = filter(splat(newer), zip_strict(sources, targets))
+    return tuple(map(list, zip(*newer_pairs)))
+
+
+def newer_group(sources, target, missing='error'):
+    """
+    Is target out-of-date with respect to any file in sources.
+
+    Return True if 'target' is out-of-date with respect to any file
+    listed in 'sources'. In other words, if 'target' exists and is newer
+    than every file in 'sources', return False; otherwise return True.
+    ``missing`` controls how to handle a missing source file:
+
+    - error (default): allow the ``stat()`` call to fail.
+    - ignore: silently disregard any missing source files.
+    - newer: treat missing source files as "target out of date". This
+      mode is handy in "dry-run" mode: it will pretend to carry out
+      commands that wouldn't work because inputs are missing, but
+      that doesn't matter because dry-run won't run the commands.
+    """
+
+    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(
+        missing_as_newer(source) or _newer(source, target)
+        for source in filter(ignored, sources)
+    )
diff --git a/distutils/bcppcompiler.py b/distutils/bcppcompiler.py
index ba45ea2b95..3c2ba15410 100644
--- a/distutils/bcppcompiler.py
+++ b/distutils/bcppcompiler.py
@@ -24,7 +24,7 @@
 )
 from .ccompiler import CCompiler, gen_preprocess_options
 from .file_util import write_file
-from .dep_util import newer
+from ._modified import newer
 from ._log import log
 
 
diff --git a/distutils/ccompiler.py b/distutils/ccompiler.py
index 1818fce901..c1c7d5476e 100644
--- a/distutils/ccompiler.py
+++ b/distutils/ccompiler.py
@@ -18,7 +18,7 @@
 from .spawn import spawn
 from .file_util import move_file
 from .dir_util import mkpath
-from .dep_util import newer_group
+from ._modified import newer_group
 from .util import split_quoted, execute
 from ._log import log
 
diff --git a/distutils/cmd.py b/distutils/cmd.py
index 3860c3ff1e..8fdcbc0ea2 100644
--- a/distutils/cmd.py
+++ b/distutils/cmd.py
@@ -10,7 +10,7 @@
 import logging
 
 from .errors import DistutilsOptionError
-from . import util, dir_util, file_util, archive_util, dep_util
+from . import util, dir_util, file_util, archive_util, _modified
 from ._log import log
 
 
@@ -428,7 +428,7 @@ def make_file(
         # If 'outfile' must be regenerated (either because it doesn't
         # exist, is out-of-date, or the 'force' flag is true) then
         # perform the action that presumably regenerates it
-        if self.force or dep_util.newer_group(infiles, outfile):
+        if self.force or _modified.newer_group(infiles, outfile):
             self.execute(func, args, exec_msg, level)
         # Otherwise, print the "skip" message
         else:
diff --git a/distutils/command/build_ext.py b/distutils/command/build_ext.py
index fbeec342c0..b48f462626 100644
--- a/distutils/command/build_ext.py
+++ b/distutils/command/build_ext.py
@@ -19,7 +19,7 @@
 )
 from ..sysconfig import customize_compiler, get_python_version
 from ..sysconfig import get_config_h_filename
-from ..dep_util import newer_group
+from .._modified import newer_group
 from ..extension import Extension
 from ..util import get_platform
 from distutils._log import log
diff --git a/distutils/command/build_scripts.py b/distutils/command/build_scripts.py
index ce222f1e52..1a4d67f492 100644
--- a/distutils/command/build_scripts.py
+++ b/distutils/command/build_scripts.py
@@ -7,7 +7,7 @@
 from stat import ST_MODE
 from distutils import sysconfig
 from ..core import Command
-from ..dep_util import newer
+from .._modified import newer
 from ..util import convert_path
 from distutils._log import log
 import tokenize
diff --git a/distutils/dep_util.py b/distutils/dep_util.py
index 18a4f2b224..09a8a2e126 100644
--- a/distutils/dep_util.py
+++ b/distutils/dep_util.py
@@ -1,68 +1,14 @@
-"""Timestamp comparison of files and groups of files."""
+import warnings
 
-import os.path
+from . import _modified
 
-from .errors import DistutilsFileError
-from .py39compat import zip_strict
-from ._functools import splat
 
-
-def _newer(source, target):
-    return not os.path.exists(target) or (
-        os.path.getmtime(source) > os.path.getmtime(target)
-    )
-
-
-def newer(source, target):
-    """
-    Is source modified more recently than target.
-
-    Returns True if 'source' is modified more recently than
-    'target' or if 'target' does not exist.
-
-    Raises DistutilsFileError if 'source' does not exist.
-    """
-    if not os.path.exists(source):
-        raise DistutilsFileError("file '%s' does not exist" % os.path.abspath(source))
-
-    return _newer(source, target)
-
-
-def newer_pairwise(sources, targets):
-    """
-    Filter filenames where sources are newer than targets.
-
-    Walk two filename iterables in parallel, testing if each source is newer
-    than its corresponding target.  Returns a pair of lists (sources,
-    targets) where source is newer than target, according to the semantics
-    of 'newer()'.
-    """
-    newer_pairs = filter(splat(newer), zip_strict(sources, targets))
-    return tuple(map(list, zip(*newer_pairs)))
-
-
-def newer_group(sources, target, missing='error'):
-    """
-    Is target out-of-date with respect to any file in sources.
-
-    Return True if 'target' is out-of-date with respect to any file
-    listed in 'sources'. In other words, if 'target' exists and is newer
-    than every file in 'sources', return False; otherwise return True.
-    ``missing`` controls how to handle a missing source file:
-
-    - error (default): allow the ``stat()`` call to fail.
-    - ignore: silently disregard any missing source files.
-    - newer: treat missing source files as "target out of date". This
-      mode is handy in "dry-run" mode: it will pretend to carry out
-      commands that wouldn't work because inputs are missing, but
-      that doesn't matter because dry-run won't run the commands.
-    """
-
-    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(
-        missing_as_newer(source) or _newer(source, target)
-        for source in filter(ignored, sources)
+def __getattr__(name):
+    if name not in ['newer', 'newer_group', 'newer_pairwise']:
+        raise AttributeError(name)
+    warnings.warn(
+        "dep_util is Deprecated. Use functions from setuptools instead.",
+        DeprecationWarning,
+        stacklevel=2,
     )
+    return getattr(_modified, name)
diff --git a/distutils/file_util.py b/distutils/file_util.py
index 7c69906646..3f3e21b567 100644
--- a/distutils/file_util.py
+++ b/distutils/file_util.py
@@ -108,7 +108,7 @@ def copy_file(  # noqa: C901
     # changing it (ie. it's not already a hard/soft link to src OR
     # (not update) and (src newer than dst).
 
-    from distutils.dep_util import newer
+    from distutils._modified import newer
     from stat import ST_ATIME, ST_MTIME, ST_MODE, S_IMODE
 
     if not os.path.isfile(src):
diff --git a/distutils/tests/test_dep_util.py b/distutils/tests/test_modified.py
similarity index 96%
rename from distutils/tests/test_dep_util.py
rename to distutils/tests/test_modified.py
index 759772d2b9..eae7a7fa04 100644
--- a/distutils/tests/test_dep_util.py
+++ b/distutils/tests/test_modified.py
@@ -1,7 +1,7 @@
-"""Tests for distutils.dep_util."""
+"""Tests for distutils._modified."""
 import os
 
-from distutils.dep_util import newer, newer_pairwise, newer_group
+from distutils._modified import newer, newer_pairwise, newer_group
 from distutils.errors import DistutilsFileError
 from distutils.tests import support
 import pytest
diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
index 6ca2332ae1..bd8db9ac3f 100644
--- a/distutils/unixccompiler.py
+++ b/distutils/unixccompiler.py
@@ -20,7 +20,7 @@
 import itertools
 
 from . import sysconfig
-from .dep_util import newer
+from ._modified import newer
 from .ccompiler import CCompiler, gen_preprocess_options, gen_lib_options
 from .errors import DistutilsExecError, CompileError, LibError, LinkError
 from ._log import log
diff --git a/distutils/util.py b/distutils/util.py
index 7ef47176e2..7ae914f7ee 100644
--- a/distutils/util.py
+++ b/distutils/util.py
@@ -14,7 +14,7 @@
 import functools
 
 from .errors import DistutilsPlatformError, DistutilsByteCompileError
-from .dep_util import newer
+from ._modified import newer
 from .spawn import spawn
 from ._log import log
 

From ce9efc41ec587d2f111fe09a4d855ffad15f95fc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Nov 2023 06:19:43 -0500
Subject: [PATCH 12/26] Extend tests for newer_pairwise and fix failed
 expectation when no files are newer.

---
 distutils/_modified.py           | 2 +-
 distutils/tests/test_modified.py | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/distutils/_modified.py b/distutils/_modified.py
index 18a4f2b224..41ab1df39e 100644
--- a/distutils/_modified.py
+++ b/distutils/_modified.py
@@ -38,7 +38,7 @@ def newer_pairwise(sources, targets):
     of 'newer()'.
     """
     newer_pairs = filter(splat(newer), zip_strict(sources, targets))
-    return tuple(map(list, zip(*newer_pairs)))
+    return tuple(map(list, zip(*newer_pairs))) or ([], [])
 
 
 def newer_group(sources, target, missing='error'):
diff --git a/distutils/tests/test_modified.py b/distutils/tests/test_modified.py
index eae7a7fa04..34ced95624 100644
--- a/distutils/tests/test_modified.py
+++ b/distutils/tests/test_modified.py
@@ -56,6 +56,14 @@ def test_newer_pairwise_mismatch(self):
         with pytest.raises(ValueError):
             newer_pairwise([one, two], [three])
 
+    def test_newer_pairwise_empty(self):
+        assert newer_pairwise([], []) == ([], [])
+
+    def test_newer_pairwise_fresh(self):
+        one, two, three, four = self._setup_1234()
+
+        assert newer_pairwise([one, three], [two, four]) == ([], [])
+
     def test_newer_group(self):
         tmpdir = self.mkdtemp()
         sources = os.path.join(tmpdir, 'sources')

From 2972e29ad43eb08241fd8ebebff1437b8d8dafb9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Nov 2023 06:05:59 -0500
Subject: [PATCH 13/26] Add newer_pairwise_group (inspired by
 setuptools.dep_util).

---
 distutils/_modified.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/distutils/_modified.py b/distutils/_modified.py
index 41ab1df39e..fbb95a8f27 100644
--- a/distutils/_modified.py
+++ b/distutils/_modified.py
@@ -1,5 +1,6 @@
 """Timestamp comparison of files and groups of files."""
 
+import functools
 import os.path
 
 from .errors import DistutilsFileError
@@ -28,7 +29,7 @@ def newer(source, target):
     return _newer(source, target)
 
 
-def newer_pairwise(sources, targets):
+def newer_pairwise(sources, targets, newer=newer):
     """
     Filter filenames where sources are newer than targets.
 
@@ -66,3 +67,6 @@ def missing_as_newer(source):
         missing_as_newer(source) or _newer(source, target)
         for source in filter(ignored, sources)
     )
+
+
+newer_pairwise_group = functools.partial(newer_pairwise, newer=newer_group)

From 378d0d5ab16baa75acc6bb91ce7eb64f5f6ea91a Mon Sep 17 00:00:00 2001
From: Daniel Nunes <gandaganza@gmail.com>
Date: Sun, 15 Jan 2017 01:36:02 +0000
Subject: [PATCH 14/26] Added tests for newer_pairwise_group().

Cherry-picked from pypa/setuptools@a40114a442e18cd29271bd3c37dbfcaf6a2ec817.
---
 distutils/tests/test_modified.py | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/distutils/tests/test_modified.py b/distutils/tests/test_modified.py
index 34ced95624..87b3ecded0 100644
--- a/distutils/tests/test_modified.py
+++ b/distutils/tests/test_modified.py
@@ -1,7 +1,7 @@
 """Tests for distutils._modified."""
 import os
 
-from distutils._modified import newer, newer_pairwise, newer_group
+from distutils._modified import newer, newer_pairwise, newer_group, newer_pairwise_group
 from distutils.errors import DistutilsFileError
 from distutils.tests import support
 import pytest
@@ -89,3 +89,30 @@ def test_newer_group(self):
         assert not newer_group([one, two, old_file], three, missing='ignore')
 
         assert newer_group([one, two, old_file], three, missing='newer')
+
+
+@pytest.fixture
+def groups_target(tmpdir):
+    """Sets up some older sources, a target and newer sources.
+    Returns a 3-tuple in this order.
+    """
+    creation_order = ['older.c', 'older.h', 'target.o', 'newer.c', 'newer.h']
+    mtime = 0
+
+    for i in range(len(creation_order)):
+        creation_order[i] = os.path.join(str(tmpdir), creation_order[i])
+        with open(creation_order[i], 'w'):
+            pass
+
+        # make sure modification times are sequential
+        os.utime(creation_order[i], (mtime, mtime))
+        mtime += 1
+
+    return creation_order[:2], creation_order[2], creation_order[3:]
+
+
+def test_newer_pairwise_group(groups_target):
+    older = newer_pairwise_group([groups_target[0]], [groups_target[1]])
+    newer = newer_pairwise_group([groups_target[2]], [groups_target[1]])
+    assert older == ([], [])
+    assert newer == ([groups_target[2]], [groups_target[1]])

From 501b753d153d5e6ca51a55d7f9b256bc3518c98a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Nov 2023 06:35:18 -0500
Subject: [PATCH 15/26] Modernize test_newer_pairwise_group by using tmp_path
 and a SimpleNamespace.

---
 distutils/tests/test_modified.py | 33 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/distutils/tests/test_modified.py b/distutils/tests/test_modified.py
index 87b3ecded0..ca07c7e853 100644
--- a/distutils/tests/test_modified.py
+++ b/distutils/tests/test_modified.py
@@ -1,10 +1,12 @@
 """Tests for distutils._modified."""
 import os
+import types
+
+import pytest
 
 from distutils._modified import newer, newer_pairwise, newer_group, newer_pairwise_group
 from distutils.errors import DistutilsFileError
 from distutils.tests import support
-import pytest
 
 
 class TestDepUtil(support.TempdirManager):
@@ -92,27 +94,26 @@ def test_newer_group(self):
 
 
 @pytest.fixture
-def groups_target(tmpdir):
-    """Sets up some older sources, a target and newer sources.
-    Returns a 3-tuple in this order.
+def groups_target(tmp_path):
+    """
+    Set up some older sources, a target, and newer sources.
+
+    Returns a simple namespace with these values.
     """
-    creation_order = ['older.c', 'older.h', 'target.o', 'newer.c', 'newer.h']
-    mtime = 0
+    filenames = ['older.c', 'older.h', 'target.o', 'newer.c', 'newer.h']
+    paths = [tmp_path / name for name in filenames]
 
-    for i in range(len(creation_order)):
-        creation_order[i] = os.path.join(str(tmpdir), creation_order[i])
-        with open(creation_order[i], 'w'):
-            pass
+    for mtime, path in enumerate(paths):
+        path.write_text('', encoding='utf-8')
 
         # make sure modification times are sequential
-        os.utime(creation_order[i], (mtime, mtime))
-        mtime += 1
+        os.utime(path, (mtime, mtime))
 
-    return creation_order[:2], creation_order[2], creation_order[3:]
+    return types.SimpleNamespace(older=paths[:2], target=paths[2], newer=paths[3:])
 
 
 def test_newer_pairwise_group(groups_target):
-    older = newer_pairwise_group([groups_target[0]], [groups_target[1]])
-    newer = newer_pairwise_group([groups_target[2]], [groups_target[1]])
+    older = newer_pairwise_group([groups_target.older], [groups_target.target])
+    newer = newer_pairwise_group([groups_target.newer], [groups_target.target])
     assert older == ([], [])
-    assert newer == ([groups_target[2]], [groups_target[1]])
+    assert newer == ([groups_target.newer], [groups_target.target])

From 603932219176de7449af496b724dd8e58d4589d1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Nov 2023 09:01:38 -0500
Subject: [PATCH 16/26] Remove latent references in docs.

---
 docs/distutils/configfile.rst   |  7 -------
 docs/distutils/packageindex.rst | 13 ++++++-------
 docs/distutils/uploading.rst    |  5 +++--
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/docs/distutils/configfile.rst b/docs/distutils/configfile.rst
index bdd7c4550a..30cccd71c0 100644
--- a/docs/distutils/configfile.rst
+++ b/docs/distutils/configfile.rst
@@ -131,13 +131,6 @@ Note that the ``doc_files`` option is simply a whitespace-separated string
 split across multiple lines for readability.
 
 
-.. seealso::
-
-   :ref:`inst-config-syntax` in "Installing Python Modules"
-      More information on the configuration files is available in the manual for
-      system administrators.
-
-
 .. rubric:: Footnotes
 
 .. [#] This ideal probably won't be achieved until auto-configuration is fully
diff --git a/docs/distutils/packageindex.rst b/docs/distutils/packageindex.rst
index ccb9a598b2..27ea717a78 100644
--- a/docs/distutils/packageindex.rst
+++ b/docs/distutils/packageindex.rst
@@ -6,11 +6,10 @@
 The Python Package Index (PyPI)
 *******************************
 
-The `Python Package Index (PyPI)`_ stores metadata describing distributions
-packaged with distutils and other publishing tools, as well the distribution
-archives themselves.
+The `Python Package Index (PyPI) <https://pypi.org>`_ stores
+metadata describing distributions packaged with distutils and
+other publishing tools, as well the distribution archives
+themselves.
 
-References to up to date PyPI documentation can be found at
-:ref:`publishing-python-packages`.
-
-.. _Python Package Index (PyPI): https://pypi.org
+The best resource for working with PyPI is the
+`Python Packaging User Guide <https://packaging.python.org>`_.
diff --git a/docs/distutils/uploading.rst b/docs/distutils/uploading.rst
index 4c391cab07..f5c4c619ab 100644
--- a/docs/distutils/uploading.rst
+++ b/docs/distutils/uploading.rst
@@ -4,5 +4,6 @@
 Uploading Packages to the Package Index
 ***************************************
 
-References to up to date PyPI documentation can be found at
-:ref:`publishing-python-packages`.
+See the
+`Python Packaging User Guide <https://packaging.python.org>`_
+for the best guidance on uploading packages.

From 03f03e7802b0842b41f70b2b1c17ab26551a7533 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Nov 2023 09:43:46 -0500
Subject: [PATCH 17/26] Limit sphinxlint jobs to 1. Workaround for
 sphinx-contrib/sphinx-lint#83.

---
 tox.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 33da3deb08..331eeed93f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,9 @@ extras =
 changedir = docs
 commands =
 	python -m sphinx -W --keep-going . {toxinidir}/build/html
-	python -m sphinxlint
+	python -m sphinxlint \
+		# workaround for sphinx-contrib/sphinx-lint#83
+		--jobs 1
 
 [testenv:finalize]
 description = assemble changelog and tag a release

From 41b9cce3d3ee81e929610ab95b928dfd08bbba22 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Nov 2023 09:58:16 -0500
Subject: [PATCH 18/26] Replace git version with released version. Ref #186.

---
 tox.ini | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 06657e4eaa..6a224b52d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,9 @@ toxworkdir={env:TOX_WORK_DIR:.tox}
 
 [testenv]
 deps =
-	# pypa/distutils#186; workaround for pytest-dev/pytest#10447
-	pytest @ git+https://github.com/RonnyPfannschmidt/pytest@fix-10447-maker-mro-order-needs-reverse
+	pytest \
+		# required for #186
+		>= 7.4.3
 
 	pytest-flake8
 	# workaround for tholo/pytest-flake8#87

From d3e5de05f6afe958d0fde20945ed0f7a2dfef270 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 10 May 2023 21:38:33 -0400
Subject: [PATCH 19/26] Disable cygwin tests for now. Ref pypa/setuptools#3921

---
 .github/workflows/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 60801acecd..c420a97654 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,6 +37,8 @@ jobs:
         run: tox
 
   test_cygwin:
+    # disabled due to lack of Rust support pypa/setuptools#3921
+    if: ${{ false }}
     strategy:
       matrix:
         python:

From d23e28a03a2c120e204c4c788ecd316e0dfe8fbb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Nov 2023 10:54:57 -0500
Subject: [PATCH 20/26] Disable integration test due to known breakage from
 deprecation warnings.

---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c420a97654..cb85ffe6ab 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -66,6 +66,7 @@ jobs:
 
   ci_setuptools:
     # Integration testing with setuptools
+    if: ${{ false }}  # disabled for deprecation warnings
     strategy:
       matrix:
         python:

From 03c6392c21800f51010d805b98aee7eb406f9c79 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Nov 2023 13:08:21 -0500
Subject: [PATCH 21/26] Allow diffcov to fail also, as it requires the tests to
 pass on the latest Python to succeed.

---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 158814e597..4d9b8a3ede 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -58,6 +58,7 @@ jobs:
 
   diffcov:
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.python == '3.12' }}
     steps:
       - uses: actions/checkout@v3
         with:

From 6e6ee9759da3e71c9e90920c2bb91b2a27df3dfc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Nov 2023 13:10:07 -0500
Subject: [PATCH 22/26] Remove newsfragment

---
 newsfragments/+drop-py37.feature.rst | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 newsfragments/+drop-py37.feature.rst

diff --git a/newsfragments/+drop-py37.feature.rst b/newsfragments/+drop-py37.feature.rst
deleted file mode 100644
index ccabdaa355..0000000000
--- a/newsfragments/+drop-py37.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Require Python 3.8 or later.

From 7a04cbda0fc71487af84e1d35055b736e339a6d6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Nov 2023 15:57:33 -0500
Subject: [PATCH 23/26] Copy concurrency setting from setuptools

---
 .github/workflows/main.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4d9b8a3ede..e36084a3e2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,6 +2,13 @@ name: tests
 
 on: [push, pull_request]
 
+concurrency:
+  group: >-
+    ${{ github.workflow }}-
+    ${{ github.ref_type }}-
+    ${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -18,10 +25,6 @@ env:
   TOX_OVERRIDE: >-
     testenv.pass_env+=GITHUB_*,FORCE_COLOR
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
 jobs:
   test:
     strategy:

From 0296279b68c7a29dbafd62f5c2d96220767bb4b6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Nov 2023 16:19:31 -0500
Subject: [PATCH 24/26] Rely on distutils._modified and deprecated
 setuptools.dep_util.

---
 setuptools/command/build_clib.py  |  2 +-
 setuptools/dep_util.py            | 32 +++++++++++--------------------
 setuptools/tests/test_dep_util.py | 30 -----------------------------
 3 files changed, 12 insertions(+), 52 deletions(-)
 delete mode 100644 setuptools/tests/test_dep_util.py

diff --git a/setuptools/command/build_clib.py b/setuptools/command/build_clib.py
index 5f4229b276..4679cd9432 100644
--- a/setuptools/command/build_clib.py
+++ b/setuptools/command/build_clib.py
@@ -1,7 +1,7 @@
 import distutils.command.build_clib as orig
 from distutils.errors import DistutilsSetupError
 from distutils import log
-from setuptools.dep_util import newer_pairwise_group
+from distutils._modified import newer_pairwise_group
 
 
 class build_clib(orig.build_clib):
diff --git a/setuptools/dep_util.py b/setuptools/dep_util.py
index dc9ccf62c2..2d8cc5217d 100644
--- a/setuptools/dep_util.py
+++ b/setuptools/dep_util.py
@@ -1,24 +1,14 @@
-from distutils.dep_util import newer_group
+import warnings
 
+from ._distutils import _modified
 
-# yes, this is was almost entirely copy-pasted from
-# 'newer_pairwise()', this is just another convenience
-# function.
-def newer_pairwise_group(sources_groups, targets):
-    """Walk both arguments in parallel, testing if each source group is newer
-    than its corresponding target. Returns a pair of lists (sources_groups,
-    targets) where sources is newer than target, according to the semantics
-    of 'newer_group()'.
-    """
-    if len(sources_groups) != len(targets):
-        raise ValueError("'sources_group' and 'targets' must be the same length")
 
-    # build a pair of lists (sources_groups, targets) where source is newer
-    n_sources = []
-    n_targets = []
-    for i in range(len(sources_groups)):
-        if newer_group(sources_groups[i], targets[i]):
-            n_sources.append(sources_groups[i])
-            n_targets.append(targets[i])
-
-    return n_sources, n_targets
+def __getattr__(name):
+    if name not in ['newer_pairwise_group']:
+        raise AttributeError(name)
+    warnings.warn(
+        "dep_util is Deprecated. Use functions from setuptools instead.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    return getattr(_modified, name)
diff --git a/setuptools/tests/test_dep_util.py b/setuptools/tests/test_dep_util.py
deleted file mode 100644
index e5027c1020..0000000000
--- a/setuptools/tests/test_dep_util.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from setuptools.dep_util import newer_pairwise_group
-import os
-import pytest
-
-
-@pytest.fixture
-def groups_target(tmpdir):
-    """Sets up some older sources, a target and newer sources.
-    Returns a 3-tuple in this order.
-    """
-    creation_order = ['older.c', 'older.h', 'target.o', 'newer.c', 'newer.h']
-    mtime = 0
-
-    for i in range(len(creation_order)):
-        creation_order[i] = os.path.join(str(tmpdir), creation_order[i])
-        with open(creation_order[i], 'w'):
-            pass
-
-        # make sure modification times are sequential
-        os.utime(creation_order[i], (mtime, mtime))
-        mtime += 1
-
-    return creation_order[:2], creation_order[2], creation_order[3:]
-
-
-def test_newer_pairwise_group(groups_target):
-    older = newer_pairwise_group([groups_target[0]], [groups_target[1]])
-    newer = newer_pairwise_group([groups_target[2]], [groups_target[1]])
-    assert older == ([], [])
-    assert newer == ([groups_target[2]], [groups_target[1]])

From 987bc92b333f6aa67e307107f297e7ad464bab7a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 8 Nov 2023 09:15:50 -0500
Subject: [PATCH 25/26] Add news fragment.

---
 newsfragments/+f8383dcd.feature.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 newsfragments/+f8383dcd.feature.rst

diff --git a/newsfragments/+f8383dcd.feature.rst b/newsfragments/+f8383dcd.feature.rst
new file mode 100644
index 0000000000..c8f0e82e55
--- /dev/null
+++ b/newsfragments/+f8383dcd.feature.rst
@@ -0,0 +1 @@
+Merged with pypa/distutils@7a04cbda0fc714.
\ No newline at end of file

From c614ef584bb2abe660875c91cad50ca23a06ab34 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 8 Nov 2023 09:58:57 -0500
Subject: [PATCH 26/26] Fallback when SETUPTOOLS_USE_DISTUTILS=stdlib

---
 setuptools/command/build_clib.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/build_clib.py b/setuptools/command/build_clib.py
index 4679cd9432..acd4d1d3ba 100644
--- a/setuptools/command/build_clib.py
+++ b/setuptools/command/build_clib.py
@@ -1,7 +1,12 @@
 import distutils.command.build_clib as orig
 from distutils.errors import DistutilsSetupError
 from distutils import log
-from distutils._modified import newer_pairwise_group
+
+try:
+    from distutils._modified import newer_pairwise_group
+except ImportError:
+    # fallback for SETUPTOOLS_USE_DISTUTILS=stdlib
+    from .._distutils._modified import newer_pairwise_group
 
 
 class build_clib(orig.build_clib):