Skip to content

Commit

Permalink
replace deprecated wheel.bdist_wheel with `setuptools.command.bdist…
Browse files Browse the repository at this point in the history
…_wheel`
  • Loading branch information
ryan-williams committed Sep 26, 2024
1 parent 424c897 commit 7f95fc9
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/python-ci-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
apt-get install --yes cmake git python-is-python3 python3 python3-pip python3-venv unzip wget
- uses: actions/checkout@v4
with:
fetch-depth: 0 # for setuptools-scm
fetch-depth: 0 # for setuptools-scm
- name: Configure Git
run: |
# This is a permissions quirk due to running Git as root inside of a Docker container
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
run: |
python --version
python -m venv ./venv-soma
./venv-soma/bin/pip install --prefer-binary pybind11-global typeguard sparse wheel
./venv-soma/bin/pip install --prefer-binary pybind11-global typeguard sparse 'setuptools>=70.1' wheel
./venv-soma/bin/pip list
- name: Build wheel
run: |
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # for setuptools-scm
fetch-depth: 0 # for setuptools-scm
- name: Check if System Integrity Protection (SIP) is enabled
run: csrutil status
- name: Install pre-built libtiledb
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
run: |
python --version
python -m venv ./venv-soma
./venv-soma/bin/pip install --prefer-binary pybind11-global typeguard sparse wheel setuptools
./venv-soma/bin/pip install --prefer-binary pybind11-global typeguard sparse wheel 'setuptools>=70.1'
./venv-soma/bin/pip list
- name: Build wheel
run: |
Expand Down Expand Up @@ -257,7 +257,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # for setuptools-scm
fetch-depth: 0 # for setuptools-scm
- name: Install pre-built libtiledb
run: |
mkdir -p external
Expand Down Expand Up @@ -302,7 +302,7 @@ jobs:
run: |
python --version
python -m venv ./venv-soma
./venv-soma/bin/pip install --prefer-binary pybind11-global typeguard sparse wheel setuptools
./venv-soma/bin/pip install --prefer-binary pybind11-global typeguard sparse wheel 'setuptools>=70.1'
./venv-soma/bin/pip list
- name: Install TileDB-SOMA-Py with setuptools and --libtiledbsoma
run: |
Expand Down Expand Up @@ -357,13 +357,13 @@ jobs:
- uses: actions/checkout@v4
with:
path: TileDB-SOMA
fetch-depth: 0 # for setuptools-scm
fetch-depth: 0 # for setuptools-scm
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Install dependencies
run: pip install --prefer-binary pybind11 wheel
run: pip install --prefer-binary pybind11 'setuptools>=70.1' wheel
- name: Build source tarball (sdist)
run: |
cd TileDB-SOMA/apis/python
Expand Down
3 changes: 1 addition & 2 deletions apis/python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
[build-system]
requires = [
"pybind11[global]>=2.10.0",
"setuptools>=65.5.1",
"wheel>=0.37.1",
"setuptools>=70.1", # `setuptools.command.bdist_wheel`
"cmake>=3.21",
]
build-backend = "setuptools.build_meta"
Expand Down
4 changes: 2 additions & 2 deletions apis/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import sys
from typing import Optional

import setuptools.command.bdist_wheel
import setuptools.command.build_ext
import wheel.bdist_wheel

try:
from pybind11.setup_helpers import Pybind11Extension
Expand Down Expand Up @@ -219,7 +219,7 @@ def run(self):
super().run()


class bdist_wheel(wheel.bdist_wheel.bdist_wheel):
class bdist_wheel(setuptools.command.bdist_wheel.bdist_wheel):
def run(self):
find_or_build_package_data(self)
super().run()
Expand Down
2 changes: 1 addition & 1 deletion doc/requirements_doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jinja2==3.1.4
nbsphinx==0.9.3
pandoc==2.3
pybind11==2.12.0
setuptools==70.0.0
setuptools==75.1.0
setuptools-scm==8.1.0
sphinx==7.3.7
sphinx-rtd-theme==2.0.0
Expand Down

0 comments on commit 7f95fc9

Please sign in to comment.