Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace distutils.dep_util with setuptools.modified #2148

Merged
merged 4 commits into from
Jan 30, 2024
Merged

Replace distutils.dep_util with setuptools.modified #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ac3ee6
Replace `distutils.dep_util` with `setuptools.modified`
Avasam Nov 20, 2023
f452780
Add version check
Avasam Dec 23, 2023
48fb8be
Merge branch 'main' of https://github.com/mhammond/pywin32 into distu…
Avasam Jan 27, 2024
f5e5368
Run black
Avasam Jan 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions com/win32com/test/pippo_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ def Method3(self, in1):


def BuildTypelib():
# https://github.com/pypa/setuptools/pull/4069
from distutils.dep_util import newer
if sys.version_info >= (3, 8):
from setuptools.modified import newer
else:
from distutils.dep_util import newer

this_dir = os.path.dirname(__file__)
idl = os.path.abspath(os.path.join(this_dir, "pippo.idl"))
Expand Down
9 changes: 5 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@
from setuptools.command.install import install
from setuptools.command.install_lib import install_lib

# https://github.com/pypa/setuptools/pull/4069
from distutils.dep_util import newer_group
from distutils.command.install_data import install_data
from distutils.command.install_lib import install_lib
from distutils.core import Extension

if sys.version_info >= (3, 8):
from setuptools.modified import newer_group
else:
from distutils.dep_util import newer_group

# some modules need a static CRT to avoid problems caused by them having a
# manifest.
Expand Down
Loading