From d5142352ffc26bf6aa496336f60fdb690d561332 Mon Sep 17 00:00:00 2001 From: Ollie Copping Date: Thu, 22 Aug 2024 15:30:43 +0100 Subject: [PATCH] Add bdist_wheel import try from setuptools As of setuptools v70.1, bdist_wheel is a part of setuptools and is being deprecated from wheel. --- src/setuptools_dso/dsocmd.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/setuptools_dso/dsocmd.py b/src/setuptools_dso/dsocmd.py index c911892..9a97b74 100644 --- a/src/setuptools_dso/dsocmd.py +++ b/src/setuptools_dso/dsocmd.py @@ -11,10 +11,18 @@ import multiprocessing as MP import logging as log -try: - from wheel.bdist_wheel import bdist_wheel as _bdist_wheel -except ImportError: - _bdist_wheel = None +def _import_bdist_wheel(): + try: + from setuptools.command import bdist_wheel as _bdist_wheel + return + except ImportError: + pass + try: + from wheel.bdist_wheel import bdist_wheel as _bdist_wheel + except ImportError: + _bdist_wheel = None + +_import_bdist_wheel() from setuptools import Command, Distribution, Extension as _Extension from setuptools.command.build_ext import build_ext as _build_ext