From 0da5a0bd5c0948fe5430f72d7f7faef012da72d6 Mon Sep 17 00:00:00 2001 From: Kazuya O'moto Date: Wed, 11 Sep 2024 01:51:09 +0900 Subject: [PATCH] Modify import from setuptools.modified --- build.py | 5 ++++- buildtools/config.py | 5 ++++- buildtools/distutils_hacks.py | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/build.py b/build.py index bd932cc7..4a9fd894 100755 --- a/build.py +++ b/build.py @@ -40,8 +40,11 @@ try: except ImportError: from buildtools.backports.shutil_which import which +try: + from setuptools.modified import newer, newer_group +except ImportError: + from distutils.dep_util import newer, newer_group -from setuptools.modified import newer, newer_group from buildtools.config import Config, msg, opj, posixjoin, loadETG, etg2sip, findCmd, \ phoenixDir, wxDir, copyIfNewer, copyFile, \ macSetLoaderNames, \ diff --git a/buildtools/config.py b/buildtools/config.py index 2c1fed32..5bee90cd 100644 --- a/buildtools/config.py +++ b/buildtools/config.py @@ -23,7 +23,10 @@ import platform from distutils.file_util import copy_file from distutils.dir_util import mkpath -from setuptools.modified import newer +try: + from setuptools.modified import newer +except ImportError: + from distutils.dep_util import newer import distutils.sysconfig diff --git a/buildtools/distutils_hacks.py b/buildtools/distutils_hacks.py index 8c81bd3f..eafd5983 100644 --- a/buildtools/distutils_hacks.py +++ b/buildtools/distutils_hacks.py @@ -18,7 +18,11 @@ import distutils.command.install_data import distutils.command.install_headers import distutils.command.clean -from setuptools.modified import newer, newer_group +try: + from setuptools.modified import newer, newer_group +except ImportError: + from distutils.dep_util import newer, newer_group + from distutils import log from .config import Config, posixjoin, loadETG, etg2sip