From 84452582d49bc9ec33c57702cb0b4185c49bc6d0 Mon Sep 17 00:00:00 2001 From: Earle Lowe Date: Mon, 22 Jan 2024 15:26:40 -0800 Subject: [PATCH] Remove distutils --- pyproject.toml | 6 +++--- setup.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f47e936c..ea6221d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,19 +28,19 @@ yum -y install epel-release \ && cmake --version \ && uname -a \ """ -before-build = "python -m pip install --upgrade pip" +before-build = "python -m pip install --upgrade pip && pip install looseversion" [tool.cibuildwheel.macos] build-verbosity = 0 before-all = "brew install gmp boost cmake" -before-build = "python -m pip install --upgrade pip" +before-build = "python -m pip install --upgrade pip && pip install looseversion" environment = {MACOSX_DEPLOYMENT_TARGET="11", SYSTEM_VERSION_COMPAT=0, BUILD_VDF_CLIENT="N"} [tool.cibuildwheel.windows] build-verbosity = 0 before-all = "git clone https://github.com/Chia-Network/mpir_gc_x64.git" environment = {BUILD_VDF_CLIENT="N", SETUPTOOLS_USE_DISTUTILS="stdlib"} -before-build = "pip install delvewheel" +before-build = "pip install delvewheel && pip install looseversion" repair-wheel-command = """ delvewheel repair -v -w {dest_dir} {wheel} \ --add-path mpir_gc_x64 \ diff --git a/setup.py b/setup.py index a030c498..ff7e4562 100644 --- a/setup.py +++ b/setup.py @@ -4,12 +4,12 @@ import shutil import subprocess import sys -from distutils.command.install import install -from distutils.version import LooseVersion from setuptools import Command, Extension, setup, errors from setuptools.command.build import build from setuptools.command.build_ext import build_ext +from setuptools.command.install import install +from looseversion import LooseVersion BUILD_HOOKS = [] INSTALL_HOOKS = []