Skip to content

Commit 2cdecf8

Browse files
authored
Merge pull request #657 from rapidsai/branch-23.12
[HOTFIX] v23.12.01
2 parents c0f8caa + 23e3f1c commit 2cdecf8

File tree

5 files changed

+22
-9
lines changed

5 files changed

+22
-9
lines changed

ci/build_wheel.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@ cd "${package_dir}"
4545

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

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

python/cucim/LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../LICENSE

python/cucim/LICENSE-3rdparty.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../LICENSE-3rdparty.md

python/cucim/pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,10 @@ docs = [
9191
cucim = "cucim.clara.cli:main"
9292

9393
[tool.setuptools]
94-
license-files = ["LICENSE"]
94+
license-files = [
95+
"LICENSE",
96+
"LICENSE-3rdparty.md",
97+
]
9598
include-package-data = true
9699

97100
[tool.setuptools.dynamic]

python/cucim/setup.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Copyright (c) 2023, NVIDIA CORPORATION.
2+
3+
from setuptools import setup
4+
from setuptools.dist import Distribution as _Distribution
5+
6+
7+
# As we vendored a shared object that links to a specific Python version,
8+
# make sure it is treated as impure so the wheel is named properly.
9+
class Distribution(_Distribution):
10+
def has_ext_modules(self):
11+
return True
12+
13+
14+
setup(
15+
distclass=Distribution,
16+
)

0 commit comments

Comments
 (0)