Merge pull request #485 from rapidsai/branch-23.06

.github/workflows/build.yaml

@@ -28,7 +28,7 @@ concurrency:
 jobs:
   python-build:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.04
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.06
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -37,20 +37,23 @@ jobs:
   upload-conda:
     needs: [python-build]
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.04
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.06
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
       date: ${{ inputs.date }}
       sha: ${{ inputs.sha }}
   docs-build:
-    if: github.ref_type == 'branch' && github.event_name == 'push'
+    if: github.ref_type == 'branch'
     needs: python-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04
+    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
     with:
-      build_type: branch
-      node_type: "gpu-latest-1"
       arch: "amd64"
+      branch: ${{ inputs.branch }}
+      build_type: ${{ inputs.build_type || 'branch' }}
       container_image: "rapidsai/ci:latest"
+      date: ${{ inputs.date }}
+      node_type: "gpu-v100-latest-1"
       run_script: "ci/build_docs.sh"
+      sha: ${{ inputs.sha }}

.github/workflows/pr.yaml

@@ -18,40 +18,40 @@ jobs:
       - conda-notebook-tests
       - docs-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.04
+    uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.06
   checks:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.04
+    uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.06
   conda-python-build:
     needs: checks
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.04
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.06
     with:
       build_type: pull-request
   conda-python-tests:
     needs: conda-python-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.04
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.06
     with:
       build_type: pull-request
       run_codecov: false
   conda-notebook-tests:
     needs: conda-python-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04
+    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
     with:
       build_type: pull-request
-      node_type: "gpu-latest-1"
+      node_type: "gpu-v100-latest-1"
       arch: "amd64"
       container_image: "rapidsai/ci:latest"
       run_script: "ci/test_notebooks.sh"
   docs-build:
     needs: conda-python-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04
+    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
     with:
       build_type: pull-request
-      node_type: "gpu-latest-1"
+      node_type: "gpu-v100-latest-1"
       arch: "amd64"
       container_image: "rapidsai/ci:latest"
       run_script: "ci/build_docs.sh"

.github/workflows/test-external.yaml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       external-project:
-        description: "one of [datashader, holoviews, all]"
+        description: "Project:"
         required: true
         type: choice
         options:
@@ -17,14 +17,16 @@ on:
           Will be ignored if external-project=all
           "
         required: false
+    schedule:
+      - cron: "0 0 * * 1" # Run every Sunday evening Pacific Time (Monday 0:00 UTC)
 
 jobs:
   test-external:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04
+    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
     with:
       build_type: branch
-      node_type: "gpu-latest-1"
+      node_type: "gpu-v100-latest-1"
       arch: "amd64"
       container_image: "rapidsai/ci:latest"
-      run_script: "./ci/test_external.sh ${{ inputs.external-project }} ${{ inputs.pr_number}}"
+      run_script: "./ci/test_external.sh ${{ inputs.external-project || 'all' }} ${{ inputs.pr_number }}"

.github/workflows/test.yaml

@@ -16,7 +16,7 @@ on:
 jobs:
   conda-python-tests:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.04
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.06
     with:
       build_type: nightly
       branch: ${{ inputs.branch }}

CHANGELOG.md

@@ -1,3 +1,27 @@
+# cuXfilter 23.06.00 (7 Jun 2023)
+
+## 🚨 Breaking Changes
+
+- Dropping Python 3.8 ([#469](https://github.com/rapidsai/cuxfilter/pull/469)) [@divyegala](https://github.com/divyegala)
+
+## 🐛 Bug Fixes
+
+- fix tests failing due to unsorted results ([#479](https://github.com/rapidsai/cuxfilter/pull/479)) [@AjayThorve](https://github.com/AjayThorve)
+
+## 🚀 New Features
+
+- GHA - external dependency testing workflow: add a schedule to run once every week ([#478](https://github.com/rapidsai/cuxfilter/pull/478)) [@AjayThorve](https://github.com/AjayThorve)
+
+## 🛠️ Improvements
+
+- Require Numba 0.57.0+ & NumPy 1.21.0+ ([#480](https://github.com/rapidsai/cuxfilter/pull/480)) [@jakirkham](https://github.com/jakirkham)
+- run docs nightly too ([#477](https://github.com/rapidsai/cuxfilter/pull/477)) [@AyodeAwe](https://github.com/AyodeAwe)
+- Update cupy to >=12 ([#475](https://github.com/rapidsai/cuxfilter/pull/475)) [@raydouglass](https://github.com/raydouglass)
+- Revert shared-action-workflows pin ([#472](https://github.com/rapidsai/cuxfilter/pull/472)) [@divyegala](https://github.com/divyegala)
+- Dropping Python 3.8 ([#469](https://github.com/rapidsai/cuxfilter/pull/469)) [@divyegala](https://github.com/divyegala)
+- Remove usage of rapids-get-rapids-version-from-git ([#468](https://github.com/rapidsai/cuxfilter/pull/468)) [@jjacobelli](https://github.com/jjacobelli)
+- Use ARC V2 self-hosted runners for GPU jobs ([#467](https://github.com/rapidsai/cuxfilter/pull/467)) [@jjacobelli](https://github.com/jjacobelli)
+
 # cuXfilter 23.04.00 (6 Apr 2023)
 
 ## 🐛 Bug Fixes

README.md

@@ -156,12 +156,12 @@ 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 `cuxfilter version == 23.04` :
+For `cuxfilter version == 23.06` :
 
 ```bash
 # for CUDA 11.8
 conda install -c rapidsai -c numba -c conda-forge -c nvidia \
-    cuxfilter=23.04 python=3.10 cudatoolkit=11.8
+    cuxfilter=23.06 python=3.10 cudatoolkit=11.8
 ```
 
 For the nightly version of `cuxfilter` :

ci/build_docs.sh

@@ -18,7 +18,7 @@ rapids-print-env
 rapids-logger "Downloading artifacts from previous jobs"
 
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
-VERSION_NUMBER=$(rapids-get-rapids-version-from-git)
+VERSION_NUMBER="23.06"
 
 rapids-mamba-retry install \
     --channel "${PYTHON_CHANNEL}" \
@@ -31,7 +31,7 @@ sphinx-build -b dirhtml ./source _html
 sphinx-build -b text ./source _text
 popd
 
-if [[ "${RAPIDS_BUILD_TYPE}" == "branch" ]]; then
+if [[ "${RAPIDS_BUILD_TYPE}" != "pull-request" ]]; then
   rapids-logger "Upload Docs to S3"
   aws s3 sync --no-progress --delete docs/_html "s3://rapidsai-docs/cuxfilter/${VERSION_NUMBER}/html"
   aws s3 sync --no-progress --delete docs/_text "s3://rapidsai-docs/cuxfilter/${VERSION_NUMBER}/txt"

ci/release/update-version.sh

@@ -46,6 +46,10 @@ done
 sed_runner "s/version == ${CURRENT_SHORT_TAG}/version == ${NEXT_SHORT_TAG}/g" README.md
 sed_runner "s/cuxfilter=${CURRENT_SHORT_TAG}/cuxfilter=${NEXT_SHORT_TAG}/g" README.md
 
+# CI files
 for FILE in .github/workflows/*.yaml; do
   sed_runner "/shared-action-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
 done
+sed_runner "s/VERSION_NUMBER=\".*/VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh
+sed_runner "s/cudf=.*/cudf=${NEXT_SHORT_TAG}/g" ci/test_external.sh
+sed_runner "s/dask-cudf=.*/dask-cudf=${NEXT_SHORT_TAG}/g" ci/test_external.sh

ci/test_external.sh

@@ -6,8 +6,8 @@ set -e
 rapids-logger "Create test_external conda environment"
 . /opt/conda/etc/profile.d/conda.sh
 
-rapids-mamba-retry create -n test_external -c rapidsai -c conda-forge -c nvidia  \
-    cudf=23.02 dask-cudf=23.02 python=3.10 cudatoolkit=11.8
+rapids-mamba-retry create -n test_external -c rapidsai-nightly -c conda-forge -c nvidia  \
+    cudf=23.06 dask-cudf=23.06 python=3.10 cudatoolkit=11.8
 
 conda activate test_external
 

conda/environments/all_cuda-118_arch-x86_64.yaml

@@ -8,12 +8,12 @@ channels:
 dependencies:
 - bokeh>=2.4.2,<=2.5
 - cudatoolkit=11.8
-- cudf=23.04
-- cugraph=23.04
-- cuspatial=23.04
-- dask-cuda=23.04
-- dask-cudf=23.04
-- datashader>=0.14,<=0.14.4
+- cudf=23.06
+- cugraph=23.06
+- cuspatial=23.06
+- dask-cuda=23.06
+- dask-cudf=23.06
+- datashader>=0.15
 - geopandas>=0.11.0
 - holoviews>=1.15.0,<=1.15.4
 - ipython
@@ -23,6 +23,8 @@ dependencies:
 - nbsphinx
 - nodejs>=14
 - notebook>=0.5.0
+- numba>=0.57
+- numpy>=1.21
 - numpydoc
 - packaging
 - pandoc<=2.0.0
@@ -33,7 +35,7 @@ dependencies:
 - pyproj>=2.4,<=3.4
 - pytest
 - pytest-cov
-- python>=3.8,<3.11
+- python>=3.9,<3.11
 - recommonmark
 - sphinx
 - sphinx-markdown-tables

conda/recipes/cuxfilter/meta.yaml

@@ -24,17 +24,18 @@ requirements:
   run:
     - bokeh >=2.4.2,<=2.5
     - cudf ={{ minor_version }}
-    - cupy >=9.5.0,<12.0.0a0
+    - cupy >=12.0.0
     - cuspatial ={{ minor_version }}
     - dask-cuda ={{ minor_version }}
     - dask-cudf ={{ minor_version }}
-    - datashader >=0.14,<=0.14.4
+    - datashader >=0.15
     - geopandas >=0.11.0
     - holoviews>=1.15.0,<=1.15.4
     - jupyter-server-proxy
     - libwebp
     - nodejs >=14
-    - numba >=0.54
+    - numba >=0.57
+    - numpy >=1.21
     - packaging
     - panel >=0.14.0,<=0.14.1
     - pydeck >=0.3,<=0.5.0

dependencies.yaml

@@ -88,15 +88,11 @@ dependencies:
           - notebook>=0.5.0
       - output_types: [conda]
         packages:
-          - cugraph=23.04
+          - cugraph=23.06
   py_version:
     specific:
       - output_types: conda
         matrices:
-          - matrix:
-              py: "3.8"
-            packages:
-              - python=3.8
           - matrix:
               py: "3.9"
             packages:
@@ -107,29 +103,31 @@ dependencies:
               - python=3.10
           - matrix:
             packages:
-              - python>=3.8,<3.11
+              - python>=3.9,<3.11
   run:
     common:
       - output_types: [conda, requirements]
         packages:
           - bokeh>=2.4.2,<=2.5
-          - datashader>=0.14,<=0.14.4
+          - datashader>=0.15
           - geopandas>=0.11.0
           - holoviews>=1.15.0,<=1.15.4
           - jupyter-server-proxy
           - libwebp
           - nodejs>=14
+          - numba>=0.57
+          - numpy>=1.21
           - packaging
           - panel >=0.14.0,<=0.14.1
           - pydeck>=0.3,<=0.5.0
           - pyppeteer>=0.2.6
           - pyproj>=2.4,<=3.4
       - output_types: conda
         packages:
-          - cudf=23.04
-          - cuspatial=23.04
-          - dask-cuda=23.04
-          - dask-cudf=23.04
+          - cudf=23.06
+          - cuspatial=23.06
+          - dask-cuda=23.06
+          - dask-cudf=23.06
   test_python:
     common:
       - output_types: [conda, requirements]

docs/source/conf.py

@@ -11,9 +11,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '23.04'
+version = '23.06'
 # The full version, including alpha/beta/rc tags
-release = '23.04.00'
+release = '23.06.00'
 
 nbsphinx_allow_errors = True
 # -- General configuration ---------------------------------------------------

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 79
-target-version = ["py38"]
+target-version = ["py39"]
 include = '\.py?$'
 force-exclude = '''
 /(

python/cuxfilter/tests/assets/test_gpu_histogram.py

@@ -152,6 +152,6 @@ def test_aggregated_column_unique():
     bc.min_value = df["key"].min()
 
     assert np.array_equal(
-        gpu_histogram.aggregated_column_unique(bc, df),
+        np.sort(np.array(gpu_histogram.aggregated_column_unique(bc, df))),
         np.array([0, 4, 9, 10, 14, 21, 22, 24, 26, 29, 34, 38, 98, 103, 108]),
     )

python/cuxfilter/tests/charts/core/test_core_graph.py

@@ -128,7 +128,7 @@ def test_box_selection_callback(
         self.result = None
 
         def t_function(data, edges=None, patch_update=False):
-            self.result = data.reset_index(drop=True)
+            self.result = data.sort_values(by="vertex").reset_index(drop=True)
 
         bg.reload_chart = t_function
 

python/cuxfilter/tests/charts/utils.py

@@ -10,8 +10,16 @@ def initialize_df(type, *df_args):
 
 
 def df_equals(df1, df2):
-    df1 = df1.compute() if isinstance(df1, dask_cudf.DataFrame) else df1
-    df2 = df2.compute() if isinstance(df2, dask_cudf.DataFrame) else df2
+    df1 = (
+        df1.compute().reset_index(drop=True)
+        if isinstance(df1, dask_cudf.DataFrame)
+        else df1.reset_index(drop=True)
+    )
+    df2 = (
+        df2.compute().reset_index(drop=True)
+        if isinstance(df2, dask_cudf.DataFrame)
+        else df2.reset_index(drop=True)
+    )
 
     return df1.equals(df2)
 

python/setup.py

@@ -17,7 +17,7 @@
         "Topic :: Scientific/Engineering",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
     ],