From cadf9d683a4d7492934ce573f2940a5d0faf7928 Mon Sep 17 00:00:00 2001 From: Ryan Mast Date: Mon, 3 Feb 2025 08:55:08 -0800 Subject: [PATCH] Import from setuptools.command.bdist_wheel which now contains functions from wheel.bdist_wheel --- .github/workflows/libclang-alpine-amd64.yml | 4 ++-- .github/workflows/libclang-linux-aarch64.yml | 4 ++-- .github/workflows/libclang-linux-amd64.yml | 4 ++-- .github/workflows/libclang-linux-arm.yml | 4 ++-- .github/workflows/libclang-macosx-amd64.yml | 4 ++-- .github/workflows/libclang-macosx-arm64.yml | 4 ++-- .github/workflows/libclang-windows-aarch64.yml | 4 ++-- .github/workflows/libclang-windows-amd64.yml | 4 ++-- setup_ext.py | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/libclang-alpine-amd64.yml b/.github/workflows/libclang-alpine-amd64.yml index 5d9ea36..17f36f8 100644 --- a/.github/workflows/libclang-alpine-amd64.yml +++ b/.github/workflows/libclang-alpine-amd64.yml @@ -21,9 +21,9 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.10' - - name: install wheel dependencies + - name: install setuptools dependencies run: | - pip3 install wheel + pip3 install -U setuptools==75.8.0 - name: get llvm-project run: | wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VER/llvm-project-$LLVM_VER.src.tar.xz diff --git a/.github/workflows/libclang-linux-aarch64.yml b/.github/workflows/libclang-linux-aarch64.yml index 0a8a8be..f2c3ef5 100644 --- a/.github/workflows/libclang-linux-aarch64.yml +++ b/.github/workflows/libclang-linux-aarch64.yml @@ -21,9 +21,9 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.10' - - name: install wheel dependencies + - name: install setuptools dependencies run: | - pip3 install wheel + pip3 install -U setuptools==75.8.0 - name: get llvm-project run: | wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VER/llvm-project-$LLVM_VER.src.tar.xz diff --git a/.github/workflows/libclang-linux-amd64.yml b/.github/workflows/libclang-linux-amd64.yml index f608888..8f8662c 100644 --- a/.github/workflows/libclang-linux-amd64.yml +++ b/.github/workflows/libclang-linux-amd64.yml @@ -21,9 +21,9 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.10' - - name: install wheel dependencies + - name: install setuptools dependencies run: | - pip3 install wheel + pip3 install -U setuptools==75.8.0 - name: get llvm-project run: | wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VER/llvm-project-$LLVM_VER.src.tar.xz diff --git a/.github/workflows/libclang-linux-arm.yml b/.github/workflows/libclang-linux-arm.yml index d5c705e..7c425fb 100644 --- a/.github/workflows/libclang-linux-arm.yml +++ b/.github/workflows/libclang-linux-arm.yml @@ -21,9 +21,9 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.10' - - name: install wheel dependencies + - name: install setuptools dependencies run: | - pip3 install wheel + pip3 install -U setuptools==75.8.0 - name: get llvm-project run: | wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VER/llvm-project-$LLVM_VER.src.tar.xz diff --git a/.github/workflows/libclang-macosx-amd64.yml b/.github/workflows/libclang-macosx-amd64.yml index 15be4b2..bb44eea 100644 --- a/.github/workflows/libclang-macosx-amd64.yml +++ b/.github/workflows/libclang-macosx-amd64.yml @@ -19,9 +19,9 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.10' - - name: install wheel dependencies + - name: install setuptools dependencies run: | - pip3 install wheel + pip3 install -U setuptools==75.8.0 - name: install gnu-tar run: | brew install gnu-tar diff --git a/.github/workflows/libclang-macosx-arm64.yml b/.github/workflows/libclang-macosx-arm64.yml index 58777e0..d9b6532 100644 --- a/.github/workflows/libclang-macosx-arm64.yml +++ b/.github/workflows/libclang-macosx-arm64.yml @@ -19,9 +19,9 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.10' - - name: install wheel dependencies + - name: install setuptools dependencies run: | - pip3 install wheel + pip3 install -U setuptools==75.8.0 - name: install gnu-tar run: | brew install gnu-tar diff --git a/.github/workflows/libclang-windows-aarch64.yml b/.github/workflows/libclang-windows-aarch64.yml index 043fc6d..f4e7600 100644 --- a/.github/workflows/libclang-windows-aarch64.yml +++ b/.github/workflows/libclang-windows-aarch64.yml @@ -18,9 +18,9 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.10' - - name: install wheel dependencies + - name: install setuptools dependencies run: | - pip3 install wheel + pip3 install -U setuptools==75.8.0 - name: get llvm-project run: | choco install wget git diff --git a/.github/workflows/libclang-windows-amd64.yml b/.github/workflows/libclang-windows-amd64.yml index b70b278..b834f8d 100644 --- a/.github/workflows/libclang-windows-amd64.yml +++ b/.github/workflows/libclang-windows-amd64.yml @@ -18,9 +18,9 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.10' - - name: install wheel dependencies + - name: install setuptools dependencies run: | - pip3 install wheel + pip3 install -U setuptools==75.8.0 - name: get llvm-project run: | choco install wget git diff --git a/setup_ext.py b/setup_ext.py index 7ca353d..39d27ed 100644 --- a/setup_ext.py +++ b/setup_ext.py @@ -7,7 +7,7 @@ from distutils.dir_util import mkpath from setuptools import setup, find_packages, Extension from setuptools.command.build_ext import build_ext -from wheel.bdist_wheel import get_platform, bdist_wheel +from setuptools.command.bdist_wheel import get_platform, bdist_wheel def platform_ext(plat):