Merge pull request #707 from rapidsai/branch-24.04

[RELEASE] integration v24.04
rapidsai · Apr 11, 2024 · 2fb2e72 · 2fb2e72
2 parents 77edc05 + 734a135
commit 2fb2e72
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/.github/ops-bot.yaml b/.github/ops-bot.yaml
@@ -3,3 +3,4 @@
 
 auto_merger: true
 branch_checker: true
+forward_merger: true
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.02
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.04
     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.02
+    uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.04
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -46,11 +46,11 @@ jobs:
   conda-pack:
     needs: [upload-conda]
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.04
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
       date: ${{ inputs.date }}
       sha: ${{ inputs.sha }}
       matrix_filter: map(select(.ARCH == "amd64"))
-      build_script: ci/conda-pack.sh
+      script: ci/conda-pack.sh
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -12,11 +12,11 @@ concurrency:
 jobs:
   build:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.04
     with:
       build_type: pull-request
   pr-builder:
     needs:
       - build
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.04
diff --git a/ci/conda-pack.sh b/ci/conda-pack.sh
@@ -3,7 +3,7 @@
 
 set -e
 
-RAPIDS_VER="24.02"
+RAPIDS_VER="24.04"
 VERSION_DESCRIPTOR="a"
 CONDA_USERNAME="rapidsai-nightly"
 

diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml
@@ -31,13 +31,13 @@ requirements:
     - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
     - cupy {{ cupy_version }}
     - nccl {{ nccl_version }}
-    - networkx {{ networkx_version }}
     - numba {{ numba_version }}
     - numpy {{ numpy_version }}
     - nvtx {{ nvtx_version }}
     - python
     - cudf ={{ major_minor_version }}.*
     - cugraph ={{ major_minor_version }}.*
+    - nx-cugraph ={{ major_minor_version }}.*
     - cuml ={{ major_minor_version }}.*
     - cucim ={{ major_minor_version }}.*
     - cuspatial ={{ major_minor_version }}.*

diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml
@@ -8,13 +8,11 @@ cupy_version:
   - '>=12.0.0'
 nccl_version:
   - '>=2.9.9,<3.0a0'
-networkx_version:
-  - '>=2.5.1'
 numba_version:
   - '>=0.57'
 numpy_version:
-  - '>=1.21'
+  - '>=1.23,<2.0a0'
 nvtx_version:
   - '>=0.2.1,<0.3'
 ucx_version:
-  - '>=1.14.1'
+  - '>=1.15.0,<1.16.0'