From 8921bad0980b8885ce93516a3ec5896353e5a268 Mon Sep 17 00:00:00 2001 From: Ray Douglass Date: Thu, 18 Jan 2024 14:59:46 -0500 Subject: [PATCH] DOC v24.04 Updates [skip ci] --- .github/workflows/build.yaml | 10 +++++----- .github/workflows/pr.yaml | 16 ++++++++-------- .github/workflows/test-external.yaml | 2 +- .github/workflows/test.yaml | 4 ++-- README.md | 6 +++--- VERSION | 2 +- ci/build_docs.sh | 2 +- ci/utils/external_dependencies.yaml | 6 +++--- conda/environments/all_cuda-118_arch-x86_64.yaml | 10 +++++----- conda/environments/all_cuda-120_arch-x86_64.yaml | 10 +++++----- dependencies.yaml | 10 +++++----- docs/source/conf.py | 4 ++-- docs/source/user_guide/installation.rst | 4 ++-- python/pyproject.toml | 6 +++--- 14 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index db2c6d70..c21c591d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,7 @@ concurrency: jobs: python-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: [python-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 }} @@ -47,7 +47,7 @@ jobs: if: github.ref_type == 'branch' needs: python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.04 with: arch: "amd64" branch: ${{ inputs.branch }} @@ -59,7 +59,7 @@ jobs: sha: ${{ inputs.sha }} wheel-build: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.04 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -70,7 +70,7 @@ jobs: wheel-publish: needs: wheel-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.04 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index ba7ed908..a73cfce1 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -20,27 +20,27 @@ jobs: - wheel-build - wheel-tests 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 checks: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.04 conda-python-build: needs: checks 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 conda-python-tests: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.04 with: build_type: pull-request run_codecov: false conda-notebook-tests: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.04 with: build_type: pull-request node_type: "gpu-v100-latest-1" @@ -50,7 +50,7 @@ jobs: docs-build: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.04 with: build_type: pull-request node_type: "gpu-v100-latest-1" @@ -60,7 +60,7 @@ jobs: wheel-build: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.04 with: build_type: pull-request script: ci/build_wheel.sh @@ -68,7 +68,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.04 with: build_type: pull-request script: ci/test_wheel.sh diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index 06e503de..37c0c6af 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -23,7 +23,7 @@ on: jobs: test-external: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.04 with: build_type: branch node_type: "gpu-v100-latest-1" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 22ba5dd4..226562d0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ on: jobs: conda-python-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.04 with: build_type: nightly branch: ${{ inputs.branch }} @@ -24,7 +24,7 @@ jobs: sha: ${{ inputs.sha }} wheel-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.04 with: build_type: nightly branch: ${{ inputs.branch }} diff --git a/README.md b/README.md index 248b1d78..8d9f0ef1 100644 --- 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 index 3c6c5e2b..4a2fe8aa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.02.00 +24.04.00 diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 0d9c2833..11912949 100755 --- 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/utils/external_dependencies.yaml b/ci/utils/external_dependencies.yaml index 265a9144..a73a14d1 100644 --- 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 index 4e2cc92b..7955d1e9 100644 --- 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-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index c78cc8c8..e4ac7f52 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -8,12 +8,12 @@ channels: dependencies: - bokeh>=3.1 - cuda-version=12.0 -- 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/dependencies.yaml b/dependencies.yaml index ed759b6f..ee883d31 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -137,8 +137,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 @@ -159,9 +159,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 index ddda56e0..2e23a333 100644 --- 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 index 8e8eafef..2261f8a6 100644 --- 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 index 0d6533d7..0b10c15d 100644 --- 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",