Merge branch 'branch-24.12' into numba-cuda

rapidsai · Oct 22, 2024 · a8ba78b · a8ba78b
2 parents c019582 + 24bc724
commit a8ba78b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -28,7 +28,7 @@ concurrency:
 jobs:
   build:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -37,7 +37,7 @@ jobs:
   upload-conda:
     needs: [build]
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.10
+    uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.12
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
   conda-pack:
     needs: [upload-conda]
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -15,16 +15,16 @@ jobs:
       - build
       - test-conda-nightly-env
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10
+    uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.12
   build:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
     with:
       build_type: pull-request
   test-conda-nightly-env:
     secrets: inherit
     # We use a build workflow so that we get CPU jobs and high matrix coverage
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
     with:
       build_type: pull-request
       script: "ci/test_conda_nightly_env.sh"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -17,7 +17,7 @@ jobs:
   test-conda-nightly-env:
     secrets: inherit
     # We use a build workflow so that we get CPU jobs and high matrix coverage
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
     with:
       build_type: pull-request
       script: "ci/test_conda_nightly_env.sh"
diff --git a/ci/conda-pack.sh b/ci/conda-pack.sh
@@ -3,7 +3,7 @@
 
 set -e
 
-RAPIDS_VER="24.10"
+RAPIDS_VER="24.12"
 VERSION_DESCRIPTOR="a"
 CONDA_USERNAME="rapidsai-nightly"
 

diff --git a/ci/test_conda_nightly_env.sh b/ci/test_conda_nightly_env.sh
@@ -3,7 +3,7 @@
 
 set -euo pipefail
 
-RAPIDS_VERSION="24.10"
+RAPIDS_VERSION="24.12"
 CUDA_VERSION=${RAPIDS_CUDA_VERSION%.*}
 
 JSON_FILENAME="rapids_cuda${CUDA_VERSION}_py${RAPIDS_PY_VERSION}.json"

diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml
@@ -35,6 +35,7 @@ requirements:
     - nvtx {{ nvtx_version }}
     - python
     - cudf ={{ major_minor_version }}.*
+    - cudf-polars ={{ major_minor_version }}.*
     - cuvs ={{ major_minor_version }}.*
     - cugraph ={{ major_minor_version }}.*
     - nx-cugraph ={{ major_minor_version }}.*