Skip to content

Commit

Permalink
Merge pull request rapidsai#658 from rapidsai/branch-23.12
Browse files Browse the repository at this point in the history
Forward-merge branch-23.12 to branch-24.02
  • Loading branch information
GPUtester authored Dec 11, 2023
2 parents 8951d79 + 23e3f1c commit daf32a8
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 9 deletions.
8 changes: 0 additions & 8 deletions ci/build_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,6 @@ cd "${package_dir}"

python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check

# Because we built the library with the run script and manually copied the shared pybind11
# library, the subsequent py_project.toml wheel build was as a pure Python package and results in
# tags that incorrectly indicate it is a universal wheel. To fix this, we need to modify the wheel
# to have CPython ABI and Python tags matching the version of Python that the Python bindings were
# built with.
WHEEL_PYTHON_TAG=cp$(echo ${RAPIDS_PY_VERSION} | sed 's/\.//g')
python -m wheel tags --remove --python-tag="${WHEEL_PYTHON_TAG}" --abi-tag="${WHEEL_PYTHON_TAG}" dist/*

mkdir -p final_dist
python -m auditwheel repair -w final_dist dist/*

Expand Down
1 change: 1 addition & 0 deletions python/cucim/LICENSE
1 change: 1 addition & 0 deletions python/cucim/LICENSE-3rdparty.md
5 changes: 4 additions & 1 deletion python/cucim/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ docs = [
cucim = "cucim.clara.cli:main"

[tool.setuptools]
license-files = ["LICENSE"]
license-files = [
"LICENSE",
"LICENSE-3rdparty.md",
]
include-package-data = true

[tool.setuptools.dynamic]
Expand Down
16 changes: 16 additions & 0 deletions python/cucim/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Copyright (c) 2023, NVIDIA CORPORATION.

from setuptools import setup
from setuptools.dist import Distribution as _Distribution


# As we vendored a shared object that links to a specific Python version,
# make sure it is treated as impure so the wheel is named properly.
class Distribution(_Distribution):
def has_ext_modules(self):
return True


setup(
distclass=Distribution,
)

0 comments on commit daf32a8

Please sign in to comment.