From cddac66ad15d5a9a7d090f86e36f221b27d4069e Mon Sep 17 00:00:00 2001 From: Ray Douglass Date: Fri, 5 Jan 2024 15:52:46 -0500 Subject: [PATCH 1/5] Update dask-cudf name --- python/dask_cudf/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/dask_cudf/pyproject.toml b/python/dask_cudf/pyproject.toml index e5237d206d4..33065da6e8d 100644 --- a/python/dask_cudf/pyproject.toml +++ b/python/dask_cudf/pyproject.toml @@ -8,7 +8,7 @@ requires = [ ] # 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" +name = "dask-cudf" dynamic = ["version"] description = "Utilities for Dask and cuDF interactions" readme = { file = "README.md", content-type = "text/markdown" } From a0697fb9556751905c1ba3e37807890ec46865f7 Mon Sep 17 00:00:00 2001 From: Ray Douglass Date: Fri, 5 Jan 2024 16:55:21 -0500 Subject: [PATCH 2/5] Set new wheel name in CI scripts --- ci/build_wheel.sh | 2 +- ci/build_wheel_dask_cudf.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index ae1d9c3fb1a..825b036a3cd 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -34,7 +34,7 @@ if ! rapids-is-release-build; then alpha_spec=',>=0.0.0a0' fi -if [[ ${package_name} == "dask_cudf" ]]; then +if [[ ${package_name} == "dask-cudf" ]]; then sed -r -i "s/cudf==(.*)\"/cudf${PACKAGE_CUDA_SUFFIX}==\1${alpha_spec}\"/g" ${pyproject_file} sed -r -i "s/dask-cuda==(.*)\"/dask-cuda==\1${alpha_spec}\"/g" ${pyproject_file} sed -r -i "s/rapids-dask-dependency==(.*)\"/rapids-dask-dependency==\1${alpha_spec}\"/g" ${pyproject_file} diff --git a/ci/build_wheel_dask_cudf.sh b/ci/build_wheel_dask_cudf.sh index 47e35c46004..28f441b6997 100755 --- a/ci/build_wheel_dask_cudf.sh +++ b/ci/build_wheel_dask_cudf.sh @@ -5,7 +5,7 @@ set -euo pipefail package_dir="python/dask_cudf" -./ci/build_wheel.sh dask_cudf ${package_dir} +./ci/build_wheel.sh dask-cudf ${package_dir} RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="dask_cudf_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 ${package_dir}/dist From 7b5dc23438b993c08d6fae7dbeea079d79474508 Mon Sep 17 00:00:00 2001 From: Ray Douglass Date: Mon, 8 Jan 2024 10:21:36 -0500 Subject: [PATCH 3/5] Fix style --- ci/build_wheel.sh | 2 +- ci/build_wheel_dask_cudf.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 825b036a3cd..e86eca94995 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. set -euo pipefail diff --git a/ci/build_wheel_dask_cudf.sh b/ci/build_wheel_dask_cudf.sh index 28f441b6997..b09c1e51271 100755 --- a/ci/build_wheel_dask_cudf.sh +++ b/ci/build_wheel_dask_cudf.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. set -euo pipefail From 83110a7ff66ac2f4e0d3acc5f371c2d32bf513cf Mon Sep 17 00:00:00 2001 From: Ray Douglass Date: Mon, 8 Jan 2024 12:57:40 -0500 Subject: [PATCH 4/5] Change wheel-build-dask-cudf to depend on wheel-build-cudf --- .github/workflows/pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 5a77c6749fe..edcc140b191 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -116,7 +116,7 @@ jobs: build_type: pull-request script: ci/test_wheel_cudf.sh wheel-build-dask-cudf: - needs: wheel-tests-cudf + needs: wheel-build-cudf secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02 with: From f58baee9a87ac389d6766ec1bdbaa63be7863493 Mon Sep 17 00:00:00 2001 From: Ray Douglass Date: Mon, 8 Jan 2024 15:14:02 -0500 Subject: [PATCH 5/5] Fix package_name as dir name --- ci/build_wheel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index e86eca94995..9c674518810 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -23,7 +23,7 @@ pyproject_file="${package_dir}/pyproject.toml" sed -i "s/^name = \"${package_name}\"/name = \"${package_name}${PACKAGE_CUDA_SUFFIX}\"/g" ${pyproject_file} echo "${version}" > VERSION -sed -i "/^__git_commit__/ s/= .*/= \"${commit}\"/g" "${package_dir}/${package_name}/_version.py" +sed -i "/^__git_commit__/ s/= .*/= \"${commit}\"/g" "${package_dir}/${package_name//-/_}/_version.py" # For nightlies we want to ensure that we're pulling in alphas as well. The # easiest way to do so is to augment the spec with a constraint containing a