From dfdd9bd47a04cbae8514d362152651b7e131938b Mon Sep 17 00:00:00 2001 From: Avasam Date: Thu, 22 Feb 2024 20:13:34 -0500 Subject: [PATCH 1/2] Using vendored version directly because distutils._modified doesn't exist in stdlib --- setuptools/command/build_clib.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/setuptools/command/build_clib.py b/setuptools/command/build_clib.py index acd4d1d3ba..6150326e2a 100644 --- a/setuptools/command/build_clib.py +++ b/setuptools/command/build_clib.py @@ -2,11 +2,8 @@ from distutils.errors import DistutilsSetupError from distutils import log -try: - from distutils._modified import newer_pairwise_group -except ImportError: - # fallback for SETUPTOOLS_USE_DISTUTILS=stdlib - from .._distutils._modified import newer_pairwise_group +# Using vendored version directly because distutils._modified doesn't exist in stdlib +from .._distutils._modified import newer_pairwise_group class build_clib(orig.build_clib): From 8a1295153e209caca358fe592f84b6e94b1fe050 Mon Sep 17 00:00:00 2001 From: Avasam Date: Thu, 22 Feb 2024 20:39:11 -0500 Subject: [PATCH 2/2] Try from setuptools --- setuptools/command/build_clib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setuptools/command/build_clib.py b/setuptools/command/build_clib.py index 6150326e2a..af1a5c9954 100644 --- a/setuptools/command/build_clib.py +++ b/setuptools/command/build_clib.py @@ -3,7 +3,7 @@ from distutils import log # Using vendored version directly because distutils._modified doesn't exist in stdlib -from .._distutils._modified import newer_pairwise_group +from setuptools.modified import newer_pairwise_group class build_clib(orig.build_clib):