Merge branch 'branch-24.04' into test-cuda-12.2

rapidsai · Jan 22, 2024 · 2a3c30c · 2a3c30c
2 parents 638db3c + 8921bad
commit 2a3c30c
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -153,16 +153,16 @@ Please see the [Demo Docker Repository](https://hub.docker.com/r/rapidsai/rapids
 
 cuxfilter can be installed with conda ([miniconda](https://conda.io/miniconda.html), or the full [Anaconda distribution](https://www.anaconda.com/download)) from the `rapidsai` channel:
 
-For nightly version `cuxfilter version == 24.02` :
+For nightly version `cuxfilter version == 24.04` :
 
 ```bash
 # for CUDA 12.0
 conda install -c rapidsai-nightly -c conda-forge -c nvidia \
-    cuxfilter=24.02 python=3.10 cuda-version=12.0
+    cuxfilter=24.04 python=3.10 cuda-version=12.0
 
 # for CUDA 11.8
 conda install -c rapidsai-nightly -c conda-forge -c nvidia \
-    cuxfilter=24.02 python=3.10 cuda-version=11.8
+    cuxfilter=24.04 python=3.10 cuda-version=11.8
 ```
 
 For the stable version of `cuxfilter` :

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-24.02.00
+24.04.00
diff --git a/ci/build_docs.sh b/ci/build_docs.sh
@@ -23,7 +23,7 @@ rapids-mamba-retry install \
     --channel "${PYTHON_CHANNEL}" \
     cuxfilter
 
-export RAPIDS_VERSION_NUMBER="24.02"
+export RAPIDS_VERSION_NUMBER="24.04"
 export RAPIDS_DOCS_DIR="$(mktemp -d)"
 
 rapids-logger "Build Python docs"

diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -3,7 +3,11 @@
 
 set -euo pipefail
 
-source rapids-env-update
+rapids-configure-conda-channels
+
+source rapids-configure-sccache
+
+source rapids-date-string
 
 rapids-print-env
 

diff --git a/ci/utils/external_dependencies.yaml b/ci/utils/external_dependencies.yaml
@@ -4,9 +4,9 @@ channels:
   - conda-forge
   - nvidia
 dependencies:
-  - cudf==24.2.*
-  - dask-cudf==24.2.*
-  - cuxfilter==24.2.*
+  - cudf==24.4.*
+  - dask-cudf==24.4.*
+  - cuxfilter==24.4.*
   - cuda-version=12.0
   - python>=3.9,<3.11
   - xarray-spatial

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -9,12 +9,12 @@ dependencies:
 - bokeh>=3.1
 - cuda-version=11.8
 - cudatoolkit
-- cudf==24.2.*
-- cugraph==24.2.*
+- cudf==24.4.*
+- cugraph==24.4.*
 - cupy>=12.0.0
-- cuspatial==24.2.*
-- dask-cuda==24.2.*
-- dask-cudf==24.2.*
+- cuspatial==24.4.*
+- dask-cuda==24.4.*
+- dask-cudf==24.4.*
 - datashader>=0.15
 - geopandas>=0.11.0
 - holoviews>=1.16.0

diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml
@@ -11,9 +11,9 @@ dependencies:
 - cudf==24.2.*
 - cugraph==24.2.*
 - cupy>=12.0.0
-- cuspatial==24.2.*
-- dask-cuda==24.2.*
-- dask-cudf==24.2.*
+- cuspatial==24.4.*
+- dask-cuda==24.4.*
+- dask-cudf==24.4.*
 - datashader>=0.15
 - geopandas>=0.11.0
 - holoviews>=1.16.0

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -141,8 +141,8 @@ dependencies:
           - notebook>=0.5.0
       - output_types: [conda]
         packages:
-          - cugraph==24.2.*
-          - dask-cuda==24.2.*
+          - cugraph==24.4.*
+          - dask-cuda==24.4.*
   py_version:
     specific:
       - output_types: conda
@@ -163,9 +163,9 @@ dependencies:
       - output_types: [conda, requirements, pyproject]
         packages:
           - bokeh>=3.1
-          - cudf==24.2.*
-          - cuspatial==24.2.*
-          - dask-cudf==24.2.*
+          - cudf==24.4.*
+          - cuspatial==24.4.*
+          - dask-cudf==24.4.*
           - datashader>=0.15
           - geopandas>=0.11.0
           - holoviews>=1.16.0

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -10,9 +10,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '24.02'
+version = '24.04'
 # The full version, including alpha/beta/rc tags
-release = '24.02.00'
+release = '24.04.00'
 
 nbsphinx_allow_errors = True
 

diff --git a/docs/source/user_guide/installation.rst b/docs/source/user_guide/installation.rst
@@ -9,11 +9,11 @@ For the most customized way of installing RAPIDS and cuxfilter, visit the select
 
     # for CUDA 12.0
     conda install -c rapidsai -c conda-forge -c nvidia \
-        cuxfilter=24.02 python=3.10 cuda-version=12.0
+        cuxfilter=24.04 python=3.10 cuda-version=12.0
 
     # for CUDA 11.8
     conda install -c rapidsai -c conda-forge -c nvidia \
-        cuxfilter=24.02 python=3.10 cuda-version=11.8
+        cuxfilter=24.04 python=3.10 cuda-version=11.8
 
 PyPI
 ----

diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -19,10 +19,10 @@ license = { text = "Apache 2.0" }
 requires-python = ">=3.9"
 dependencies = [
     "bokeh>=3.1",
-    "cudf==24.2.*",
+    "cudf==24.4.*",
     "cupy-cuda11x>=12.0.0",
-    "cuspatial==24.2.*",
-    "dask-cudf==24.2.*",
+    "cuspatial==24.4.*",
+    "dask-cudf==24.4.*",
     "datashader>=0.15",
     "geopandas>=0.11.0",
     "holoviews>=1.16.0",