Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove MANIFEST.in use auto-generated one for sdists and package_data for wheels #12960

Merged
merged 4 commits into from
Mar 17, 2023
+8 −29
Merged

Remove MANIFEST.in use auto-generated one for sdists and package_data for wheels #12960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f80d49
Remove MANIFEST and add package_data.
vyasr Mar 16, 2023
f99bed2
Also update cudf-kafka.
vyasr Mar 16, 2023
02dea12
Fix typo.
vyasr Mar 16, 2023
fa441e2
Revert "Avoid building cython twice (#12945)"
vyasr Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,10 +331,9 @@ fi
if buildAll || hasArg cudf; then

cd ${REPODIR}/python/cudf
python setup.py build_ext --inplace -- -DCMAKE_PREFIX_PATH=${INSTALL_PREFIX} -DCMAKE_LIBRARY_PATH=${LIBCUDF_BUILD_DIR} -DCMAKE_CUDA_ARCHITECTURES=${CUDF_CMAKE_CUDA_ARCHITECTURES} ${EXTRA_CMAKE_ARGS} -- -j${PARALLEL_LEVEL:-1}
vyasr marked this conversation as resolved.
Show resolved Hide resolved
if [[ ${INSTALL_TARGET} != "" ]]; then
python setup.py install --single-version-externally-managed --record=record.txt -- -DCMAKE_PREFIX_PATH=${INSTALL_PREFIX} -DCMAKE_CUDA_ARCHITECTURES=${CUDF_CMAKE_CUDA_ARCHITECTURES} -DCMAKE_LIBRARY_PATH=${LIBCUDF_BUILD_DIR} ${EXTRA_CMAKE_ARGS} -- -j${PARALLEL_LEVEL:-1}
else
python setup.py build_ext --inplace -- -DCMAKE_PREFIX_PATH=${INSTALL_PREFIX} -DCMAKE_CUDA_ARCHITECTURES=${CUDF_CMAKE_CUDA_ARCHITECTURES} -DCMAKE_LIBRARY_PATH=${LIBCUDF_BUILD_DIR} ${EXTRA_CMAKE_ARGS} -- -j${PARALLEL_LEVEL:-1}
python setup.py install --single-version-externally-managed --record=record.txt -- -DCMAKE_PREFIX_PATH=${INSTALL_PREFIX} -DCMAKE_LIBRARY_PATH=${LIBCUDF_BUILD_DIR} ${EXTRA_CMAKE_ARGS} -- -j${PARALLEL_LEVEL:-1}
fi
fi

Expand Down
16 changes: 0 additions & 16 deletions python/cudf/MANIFEST.in
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions python/cudf/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
from setuptools import find_packages
from skbuild import setup

packages = find_packages(include=["cudf*", "udf_cpp*"])
setup(
include_package_data=True,
packages=find_packages(include=["cudf", "cudf.*"]),
packages=packages,
package_data={key: ["*.pxd", "*.hpp", "*.cuh"] for key in packages},
vyasr marked this conversation as resolved.
Show resolved Hide resolved
zip_safe=False,
)
3 changes: 0 additions & 3 deletions python/cudf_kafka/MANIFEST.in
View file
Open in desktop

This file was deleted.

8 changes: 3 additions & 5 deletions python/cudf_kafka/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
)
]

packages = find_packages(include=["cudf_kafka*"])
setup(
# Include the separately-compiled shared library
ext_modules=cythonize(
Expand All @@ -89,10 +90,7 @@
profile=False, language_level=3, embedsignature=True
),
),
packages=find_packages(include=["cudf_kafka", "cudf_kafka.*"]),
package_data=dict.fromkeys(
find_packages(include=["cudf_kafka._lib*"]),
["*.pxd"],
),
packages=packages,
package_data={key: ["*.pxd"] for key in packages},
zip_safe=False,
)