diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index d02825b73d1..dd4482375b9 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -133,5 +133,6 @@ jobs: with: build_type: pull-request package-name: dask_cudf - test-before: "RAPIDS_PY_WHEEL_NAME=cudf_cu11 rapids-download-wheels-from-s3 ./local-cudf-dep && python -m pip install --no-deps ./local-cudf-dep/cudf*.whl" + # Install the cudf we just built, and also test against latest dask/distributed/dask-cuda. + test-before: "RAPIDS_PY_WHEEL_NAME=cudf_cu11 rapids-download-wheels-from-s3 ./local-cudf-dep && python -m pip install --no-deps ./local-cudf-dep/cudf*.whl && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.04" test-unittest: "python -m pytest -v -n 8 ./python/dask_cudf/dask_cudf/tests" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c808e1475e6..a4bd14439b0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -97,4 +97,6 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} package-name: dask_cudf + # Test against latest dask/distributed/dask-cuda. + test-before: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.04" test-unittest: "python -m pytest -v -n 8 ./python/dask_cudf/dask_cudf/tests" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1eb2c508db9..8b46eb25950 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -161,7 +161,7 @@ repos: ^CHANGELOG.md$ ) - repo: https://github.com/rapidsai/dependency-file-generator - rev: v1.4.0 + rev: v1.5.1 hooks: - id: rapids-dependency-file-generator args: ["--clean"] diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index e5c9ba0569f..dc5ea6015f9 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -24,6 +24,11 @@ NEXT_MINOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[2]}') NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR} NEXT_UCX_PY_VERSION="$(curl -sL https://version.gpuci.io/rapids/${NEXT_SHORT_TAG}).*" +# Need to distutils-normalize the versions for some use cases +CURRENT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${CURRENT_SHORT_TAG}'))") +NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))") +echo "current is ${CURRENT_SHORT_TAG_PEP440}, next is ${NEXT_SHORT_TAG_PEP440}" + echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG" # Inplace sed replace; workaround for Linux and Mac @@ -70,9 +75,10 @@ sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/cudf/source/ # bump rmm & dask-cuda for FILE in conda/environments/*.yaml dependencies.yaml; do - sed_runner "s/dask-cuda=${CURRENT_SHORT_TAG}/dask-cuda=${NEXT_SHORT_TAG}/g" ${FILE}; - sed_runner "s/rmm=${CURRENT_SHORT_TAG}/rmm=${NEXT_SHORT_TAG}/g" ${FILE}; - sed_runner "s/rmm-cu11=${CURRENT_SHORT_TAG}/rmm-cu11=${NEXT_SHORT_TAG}/g" ${FILE}; + sed_runner "s/dask-cuda==${CURRENT_SHORT_TAG_PEP440}/dask-cuda==${NEXT_SHORT_TAG_PEP440}/g" ${FILE}; + sed_runner "s/rmm==${CURRENT_SHORT_TAG_PEP440}/rmm==${NEXT_SHORT_TAG_PEP440}/g" ${FILE}; + sed_runner "s/cudf==${CURRENT_SHORT_TAG_PEP440}/cudf==${NEXT_SHORT_TAG_PEP440}/g" ${FILE}; + sed_runner "s/cudf_kafka==${CURRENT_SHORT_TAG_PEP440}/cudf_kafka==${NEXT_SHORT_TAG_PEP440}/g" ${FILE}; done # Doxyfile update @@ -86,13 +92,11 @@ sed_runner "s/cudf=${CURRENT_SHORT_TAG}/cudf=${NEXT_SHORT_TAG}/g" README.md sed_runner "s/CUDF_TAG branch-${CURRENT_SHORT_TAG}/CUDF_TAG branch-${NEXT_SHORT_TAG}/" cpp/examples/basic/CMakeLists.txt sed_runner "s/CUDF_TAG branch-${CURRENT_SHORT_TAG}/CUDF_TAG branch-${NEXT_SHORT_TAG}/" cpp/examples/strings/CMakeLists.txt -# Need to distutils-normalize the original version -NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))") - # Dependency versions in pyproject.toml sed_runner "s/rmm==.*\",/rmm==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/cudf/pyproject.toml sed_runner "s/cudf==.*\",/cudf==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/dask_cudf/pyproject.toml for FILE in .github/workflows/*.yaml; do sed_runner "/shared-action-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}" + sed_runner "s/dask-cuda.git@branch-[^\"\s]\+/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" ${FILE}; done diff --git a/ci/test_java.sh b/ci/test_java.sh index f905aaa1178..e4df62501cc 100755 --- a/ci/test_java.sh +++ b/ci/test_java.sh @@ -38,7 +38,7 @@ set +e rapids-logger "Run Java tests" pushd java -mvn test -B -DCUDF_JNI_ARROW_STATIC=OFF -DCUDF_JNI_ENABLE_PROFILING=OFF +mvn test -B -DCUDF_JNI_ENABLE_PROFILING=OFF popd rapids-logger "Test script exiting with value: $EXITCODE" diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 66d375910d4..ef92a9ad80f 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -21,7 +21,7 @@ dependencies: - cupy>=9.5.0,<12.0.0a0 - cxx-compiler - cython>=0.29,<0.30 -- dask-cuda=23.04.* +- dask-cuda==23.4.* - dask>=2023.1.1 - distributed>=2023.1.1 - dlpack>=0.5,<0.6.0a0 @@ -32,11 +32,12 @@ dependencies: - gcc_linux-64=11.* - hypothesis - ipython -- libarrow=10 +- libarrow==10.0.1.* - librdkafka=1.7.0 -- librmm=23.04.* +- librmm==23.4.* - mimesis>=4.1.0 - moto>=4.0.8 +- msgpack-python - myst-nb - nbsphinx - ninja @@ -53,7 +54,7 @@ dependencies: - pre-commit - protobuf>=4.21.6,<4.22 - ptxcompiler -- pyarrow=10 +- pyarrow==10.0.1.* - pydata-sphinx-theme - pyorc - pytest @@ -61,11 +62,11 @@ dependencies: - pytest-cases - pytest-cov - pytest-xdist -- python-confluent-kafka=1.7.0 +- python-confluent-kafka==1.7.0 - python-snappy>=0.6.0 - python>=3.8,<3.11 - pytorch<1.12.0 -- rmm=23.04.* +- rmm==23.4.* - s3fs>=2022.3.0 - scikit-build>=0.13.1 - scipy diff --git a/cpp/cmake/thirdparty/get_arrow.cmake b/cpp/cmake/thirdparty/get_arrow.cmake index 943b89238e0..a716995182d 100644 --- a/cpp/cmake/thirdparty/get_arrow.cmake +++ b/cpp/cmake/thirdparty/get_arrow.cmake @@ -379,6 +379,8 @@ endfunction() if(NOT DEFINED CUDF_VERSION_Arrow) set(CUDF_VERSION_Arrow + # This version must be kept in sync with the libarrow version pinned for builds in + # dependencies.yaml. 10.0.1 CACHE STRING "The version of Arrow to find (or build)" ) diff --git a/dependencies.yaml b/dependencies.yaml index 7b623d58425..e3fe3bbda0d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -8,31 +8,43 @@ files: includes: - build_all - build_cpp + - build_wheels - build_python + - build_python_common - cudatoolkit - develop - docs - notebooks - py_version - - run + - run_common + - run_cudf + - run_dask_cudf + - run_cudf_kafka + - run_custreamz - test_cpp - - test_python + - test_python_common + - test_python_cudf + - test_python_dask_cudf test_cpp: output: none includes: - cudatoolkit - - libidentify_stream_usage_build - test_cpp + - libarrow_run test_python: output: none includes: - cudatoolkit - py_version - - test_python + - test_python_common + - test_python_cudf + - test_python_dask_cudf + - pyarrow_run test_java: output: none includes: - build_all + - libarrow_run - cudatoolkit - test_java test_notebooks: @@ -51,6 +63,103 @@ files: - cudatoolkit - docs - py_version + py_build_cudf: + output: pyproject + pyproject_dir: python/cudf + extras: + table: build-system + includes: + - build_all + - build_python + - build_python_common + - build_wheels + py_run_cudf: + output: pyproject + pyproject_dir: python/cudf + extras: + table: project + includes: + - run_common + - run_cudf + - pyarrow_run + py_test_cudf: + output: pyproject + pyproject_dir: python/cudf + extras: + table: project.optional-dependencies + key: test + includes: + - test_python_common + - test_python_cudf + py_build_dask_cudf: + output: pyproject + pyproject_dir: python/dask_cudf + extras: + table: build-system + includes: + - build_wheels + py_run_dask_cudf: + output: pyproject + pyproject_dir: python/dask_cudf + extras: + table: project + includes: + - run_common + - run_dask_cudf + py_test_dask_cudf: + output: pyproject + pyproject_dir: python/dask_cudf + extras: + table: project.optional-dependencies + key: test + includes: + - test_python_common + - test_python_dask_cudf + py_build_cudf_kafka: + output: pyproject + pyproject_dir: python/cudf_kafka + extras: + table: build-system + includes: + - build_wheels + - build_python_common + py_run_cudf_kafka: + output: pyproject + pyproject_dir: python/cudf_kafka + extras: + table: project + includes: + - run_cudf_kafka + py_test_cudf_kafka: + output: pyproject + pyproject_dir: python/cudf_kafka + extras: + table: project.optional-dependencies + key: test + includes: + - test_python_common + py_build_custreamz: + output: pyproject + pyproject_dir: python/custreamz + extras: + table: build-system + includes: + - build_wheels + py_run_custreamz: + output: pyproject + pyproject_dir: python/custreamz + extras: + table: project + includes: + - run_custreamz + py_test_custreamz: + output: pyproject + pyproject_dir: python/custreamz + extras: + table: project.optional-dependencies + key: test + includes: + - test_python_common channels: - rapidsai - rapidsai-nightly @@ -61,29 +170,28 @@ channels: dependencies: build_all: common: - - output_types: [conda, requirements] + - output_types: [conda, requirements, pyproject] packages: - &cmake_ver cmake>=3.23.1,!=3.25.0 - - dlpack>=0.5,<0.6.0a0 - ninja - output_types: conda packages: - - libarrow=10 - c-compiler - cxx-compiler + - dlpack>=0.5,<0.6.0a0 specific: - output_types: conda matrices: - matrix: arch: x86_64 packages: - - &gcc_amd64 gcc_linux-64=11.* - - &sysroot_amd64 sysroot_linux-64==2.17 + - gcc_linux-64=11.* + - sysroot_linux-64==2.17 - matrix: arch: aarch64 packages: - - &gcc_aarch64 gcc_linux-aarch64=11.* - - &sysroot_aarch64 sysroot_linux-aarch64==2.17 + - gcc_linux-aarch64=11.* + - sysroot_linux-aarch64==2.17 - output_types: conda matrices: - matrix: @@ -100,24 +208,54 @@ dependencies: common: - output_types: [conda, requirements] packages: - - librmm=23.04.* + - librmm==23.4.* - output_types: conda packages: - fmt>=9.1.0,<10 - librdkafka=1.7.0 - spdlog>=1.11.0,<1.12 - build_python: + # Hard pin the patch version used during the build. This must be kept + # in sync with the version pinned in get_arrow.cmake. + - libarrow==10.0.1.* + build_wheels: common: - - output_types: [conda, requirements] + - output_types: pyproject + packages: + - wheel + - setuptools + build_python_common: + common: + - output_types: [conda, requirements, pyproject] packages: - - cuda-python>=11.7.1,<12.0 - cython>=0.29,<0.30 - - pyarrow=10 - - rmm=23.04.* + # Hard pin the patch version used during the build. This must be kept + # in sync with the version pinned in get_arrow.cmake. + - pyarrow==10.0.1.* + - numpy>=1.21 + build_python: + common: + - output_types: [conda, requirements, pyproject] + packages: - scikit-build>=0.13.1 + - rmm==23.4.* - output_types: conda packages: - - protobuf>=4.21.6,<4.22 + - &protobuf protobuf>=4.21.6,<4.22 + - output_types: pyproject + packages: + - protoc-wheel + libarrow_run: + common: + - output_types: [conda, requirements] + packages: + # Allow runtime version to float up to minor version + - libarrow==10.* + pyarrow_run: + common: + - output_types: [conda, requirements, pyproject] + packages: + # Allow runtime version to float up to minor version + - pyarrow==10.* cudatoolkit: specific: - output_types: conda @@ -161,66 +299,6 @@ dependencies: - sphinx-copybutton - sphinx-markdown-tables - sphinxcontrib-websupport - libidentify_stream_usage_build: - common: - - output_types: conda - packages: - - *cmake_ver - specific: - - output_types: conda - matrices: - - matrix: - arch: x86_64 - packages: - - *gcc_amd64 - - *sysroot_amd64 - - matrix: - arch: aarch64 - packages: - - *gcc_aarch64 - - *sysroot_aarch64 - - output_types: conda - matrices: - - matrix: - arch: x86_64 - cuda: "11.2" - packages: - - nvcc_linux-64=11.2 - - matrix: - arch: aarch64 - cuda: "11.2" - packages: - - nvcc_linux-aarch64=11.2 - - matrix: - arch: x86_64 - cuda: "11.4" - packages: - - nvcc_linux-64=11.4 - - matrix: - arch: aarch64 - cuda: "11.4" - packages: - - nvcc_linux-aarch64=11.4 - - matrix: - arch: x86_64 - cuda: "11.5" - packages: - - nvcc_linux-64=11.5 - - matrix: - arch: aarch64 - cuda: "11.5" - packages: - - nvcc_linux-aarch64=11.5 - - matrix: - arch: x86_64 - cuda: "11.8" - packages: - - nvcc_linux-64=11.8 - - matrix: - arch: aarch64 - cuda: "11.8" - packages: - - nvcc_linux-aarch64=11.8 notebooks: common: - output_types: [conda, requirements] @@ -247,22 +325,25 @@ dependencies: - matrix: packages: - python>=3.8,<3.11 - run: + run_common: common: - - output_types: [conda, requirements] + - output_types: [conda, requirements, pyproject] packages: - - cachetools - - dask>=2023.1.1 - - distributed>=2023.1.1 - fsspec>=0.6.0 - - numba>=0.56.2 - numpy>=1.21 + - pandas>=1.3,<1.6.0dev0 + run_cudf: + common: + - output_types: [conda, requirements, pyproject] + packages: + - cachetools + - cuda-python>=11.7.1,<12.0 + - numba>=0.56.2 - nvtx>=0.2.1 - packaging - - pandas>=1.3,<1.6.0dev0 - - python-confluent-kafka=1.7.0 - - streamz + - rmm==23.4.* - typing_extensions + - *protobuf - output_types: conda packages: - cubinlinker @@ -271,7 +352,6 @@ dependencies: - pip: - git+https://github.com/python-streamz/streamz.git@master - ptxcompiler - - rmm=23.04.* - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -280,7 +360,11 @@ dependencies: - cubinlinker-cu11 - git+https://github.com/python-streamz/streamz.git@master - ptxcompiler-cu11 - - rmm-cu11=23.04.* + - output_types: pyproject + packages: + - cubinlinker + - &cupy_pip cupy-cuda11x>=9.5.0,<12.0.0a0 + - ptxcompiler specific: - output_types: requirements matrices: @@ -292,6 +376,34 @@ dependencies: arch: aarch64 packages: - cupy-cuda11x -f https://pip.cupy.dev/aarch64 # TODO: Verify that this works. + run_dask_cudf: + common: + - output_types: [conda, requirements, pyproject] + packages: + - dask>=2023.1.1 + - distributed>=2023.1.1 + - output_types: pyproject + packages: + - &cudf cudf==23.4.* + - *cupy_pip + run_cudf_kafka: + common: + - output_types: conda + packages: + - python-confluent-kafka==1.7.0 + - output_types: [requirements, pyproject] + packages: + - *cudf + - confluent-kafka==1.7.0 + run_custreamz: + common: + - output_types: [conda, requirements, pyproject] + packages: + - streamz + - output_types: [requirements, pyproject] + packages: + - *cudf + - cudf_kafka==23.4.* test_cpp: specific: - output_types: conda @@ -320,27 +432,39 @@ dependencies: cuda: "11.8" packages: - cuda-nvtx=11.8 - test_python: + test_python_common: common: - - output_types: [conda, requirements] + - output_types: [conda, requirements, pyproject] + packages: + - pytest + - pytest-cov + - pytest-xdist + test_python_cudf: + common: + - output_types: [conda, requirements, pyproject] packages: - - aiobotocore>=2.2.0 - - boto3>=1.21.21 - - botocore>=1.24.21 - - dask-cuda=23.04.* - fastavro>=0.22.9 - hypothesis - mimesis>=4.1.0 - - moto>=4.0.8 - pyorc - - pytest - pytest-benchmark - pytest-cases - - pytest-cov - - pytest-xdist - python-snappy>=0.6.0 - - s3fs>=2022.3.0 - scipy + - output_types: conda + packages: + - aiobotocore>=2.2.0 + - boto3>=1.21.21 + - botocore>=1.24.21 + - msgpack-python + - moto>=4.0.8 + - s3fs>=2022.3.0 + - output_types: pyproject + packages: + - msgpack + - &tokenizers tokenizers==0.13.1 + - &transformers transformers==4.24.0 + - tzdata specific: - output_types: conda matrices: @@ -352,7 +476,13 @@ dependencies: - pytorch<1.12.0 # We only install these on x86_64 to avoid pulling pytorch as a # dependency of transformers. - - tokenizers==0.13.1 - - transformers==4.24.0 + - *tokenizers + - *transformers - matrix: packages: + test_python_dask_cudf: + common: + - output_types: [conda, requirements, pyproject] + packages: + - dask-cuda==23.4.* + - numba>=0.56.2 diff --git a/python/cudf/pyproject.toml b/python/cudf/pyproject.toml index 5b259b1dc66..6832a7aef26 100644 --- a/python/cudf/pyproject.toml +++ b/python/cudf/pyproject.toml @@ -3,18 +3,17 @@ [build-system] build-backend = "setuptools.build_meta" requires = [ - "wheel", - "setuptools", - "cython>=0.29,<0.30", - "scikit-build>=0.13.1", "cmake>=3.23.1,!=3.25.0", + "cython>=0.29,<0.30", "ninja", - "numpy", - # Hard pin the patch version used during the build. - "pyarrow==10.0.1", + "numpy>=1.21", "protoc-wheel", + "pyarrow==10.0.1.*", "rmm==23.4.*", -] + "scikit-build>=0.13.1", + "setuptools", + "wheel", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project] name = "cudf" @@ -28,7 +27,9 @@ license = { text = "Apache 2.0" } requires-python = ">=3.8" dependencies = [ "cachetools", + "cubinlinker", "cuda-python>=11.7.1,<12.0", + "cupy-cuda11x>=9.5.0,<12.0.0a0", "fsspec>=0.6.0", "numba>=0.56.2", "numpy>=1.21", @@ -36,14 +37,11 @@ dependencies = [ "packaging", "pandas>=1.3,<1.6.0dev0", "protobuf>=4.21.6,<4.22", - "typing_extensions", - # Allow floating minor versions for Arrow. - "pyarrow==10", - "rmm==23.4.*", "ptxcompiler", - "cubinlinker", - "cupy-cuda11x", -] + "pyarrow==10.*", + "rmm==23.4.*", + "typing_extensions", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers", "Topic :: Database", @@ -56,18 +54,22 @@ classifiers = [ [project.optional-dependencies] test = [ + "fastavro>=0.22.9", + "hypothesis", + "mimesis>=4.1.0", + "msgpack", + "pyorc", "pytest", "pytest-benchmark", + "pytest-cases", + "pytest-cov", "pytest-xdist", - "hypothesis", - "mimesis>=4.1.0", - "fastavro>=0.22.9", "python-snappy>=0.6.0", - "pyorc", - "msgpack", + "scipy", + "tokenizers==0.13.1", "transformers==4.24.0", "tzdata", -] +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project.urls] Homepage = "https://github.com/rapidsai/cudf" diff --git a/python/cudf_kafka/MANIFEST.in b/python/cudf_kafka/MANIFEST.in new file mode 100644 index 00000000000..249a9238816 --- /dev/null +++ b/python/cudf_kafka/MANIFEST.in @@ -0,0 +1,3 @@ +# Cython files +recursive-include cudf_kafka *.pxd +recursive-include cudf_kafka *.pyx diff --git a/python/cudf_kafka/pyproject.toml b/python/cudf_kafka/pyproject.toml index 308a7869bc0..ccaa08eeef5 100644 --- a/python/cudf_kafka/pyproject.toml +++ b/python/cudf_kafka/pyproject.toml @@ -3,10 +3,41 @@ [build-system] requires = [ - "wheel", - "setuptools", "cython>=0.29,<0.30", + "numpy>=1.21", + "pyarrow==10.0.1.*", + "setuptools", + "wheel", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. + +[project] +name = "cudf_kafka" +version = "23.04.00" +description = "cuDF Kafka Datasource" +readme = { file = "README.md", content-type = "text/markdown" } +authors = [ + { name = "NVIDIA Corporation" }, ] +license = { text = "Apache 2.0" } +requires-python = ">=3.8" +dependencies = [ + "confluent-kafka==1.7.0", + "cudf==23.4.*", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. + +[project.optional-dependencies] +test = [ + "pytest", + "pytest-cov", + "pytest-xdist", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. + +[project.urls] +Homepage = "https://github.com/rapidsai/cudf" +Documentation = "https://docs.rapids.ai/api/cudf/stable/" + +[tool.setuptools] +license-files = ["LICENSE"] [tool.isort] line_length = 79 diff --git a/python/cudf_kafka/setup.py b/python/cudf_kafka/setup.py index c39b65cdb55..c915b7e80ab 100644 --- a/python/cudf_kafka/setup.py +++ b/python/cudf_kafka/setup.py @@ -10,10 +10,6 @@ from setuptools import find_packages, setup from setuptools.extension import Extension -install_requires = ["cudf", "cython"] - -extras_require = {"test": ["pytest", "pytest-xdist"]} - cython_files = ["cudf_kafka/_lib/*.pyx"] CUDA_HOME = os.environ.get("CUDA_HOME", False) @@ -85,23 +81,6 @@ ] setup( - name="cudf_kafka", - version="23.04.00", - description="cuDF Kafka Datasource", - url="https://github.com/rapidsai/cudf", - author="NVIDIA Corporation", - license="Apache 2.0", - classifiers=[ - "Intended Audience :: Developers", - "Topic :: Streaming", - "Topic :: Scientific/Engineering", - "Topic :: Apache Kafka", - "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - ], # Include the separately-compiled shared library ext_modules=cythonize( extensions, @@ -115,7 +94,5 @@ find_packages(include=["cudf_kafka._lib*"]), ["*.pxd"], ), - install_requires=install_requires, - extras_require=extras_require, zip_safe=False, ) diff --git a/python/custreamz/pyproject.toml b/python/custreamz/pyproject.toml index 315621fa3c1..657b3865495 100644 --- a/python/custreamz/pyproject.toml +++ b/python/custreamz/pyproject.toml @@ -3,9 +3,9 @@ [build-system] build-backend = "setuptools.build_meta" requires = [ - "wheel", "setuptools", -] + "wheel", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project] name = "custreamz" @@ -18,9 +18,10 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.8" dependencies = [ - "cudf", - "cudf_kafka", -] + "cudf==23.4.*", + "cudf_kafka==23.4.*", + "streamz", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers", "Topic :: Streaming", @@ -36,8 +37,9 @@ classifiers = [ [project.optional-dependencies] test = [ "pytest", + "pytest-cov", "pytest-xdist", -] +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project.urls] Homepage = "https://github.com/rapidsai/cudf" diff --git a/python/dask_cudf/pyproject.toml b/python/dask_cudf/pyproject.toml index 79a9aca9e96..49e1cb38da4 100644 --- a/python/dask_cudf/pyproject.toml +++ b/python/dask_cudf/pyproject.toml @@ -3,9 +3,9 @@ [build-system] build-backend = "setuptools.build_meta" requires = [ - "wheel", "setuptools", -] + "wheel", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project] name = "dask_cudf" @@ -18,14 +18,14 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.8" dependencies = [ + "cudf==23.4.*", + "cupy-cuda11x>=9.5.0,<12.0.0a0", "dask>=2023.1.1", "distributed>=2023.1.1", "fsspec>=0.6.0", "numpy>=1.21", "pandas>=1.3,<1.6.0dev0", - "cudf==23.4.*", - "cupy-cuda11x", -] +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers", "Topic :: Database", @@ -40,12 +40,12 @@ dynamic = ["entry-points"] [project.optional-dependencies] test = [ - "numpy>=1.21", - "pandas>=1.3,<1.6.0dev0", + "dask-cuda==23.4.*", + "numba>=0.56.2", "pytest", + "pytest-cov", "pytest-xdist", - "numba>=0.56.2", -] +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project.urls] Homepage = "https://github.com/rapidsai/cudf"