Merge branch 'branch-24.08' into cuda-12.5.1

.gitignore

@@ -148,10 +148,13 @@ ENV/
 .mypy_cache/
 
 # notebook/example generated files
+docs/source/user_guide/cache/
+docs/source/user_guide/*.csv
 notebooks/taxi2016.csv
 notebooks/taxi2017.csv
 notebooks/tzones_lonlat.json
 notebooks/cu_taxi.zones.*
+*.parquet
 
 # clang tooling
 compile_commands.json

ci/test_notebooks.sh

@@ -26,27 +26,39 @@ set -u
 rapids-print-env
 
 NBTEST="$(realpath "$(dirname "$0")/utils/nbtest.sh")"
-pushd notebooks
 
 # Add notebooks that should be skipped here
 # (space-separated list of filenames without paths)
-SKIPNBS="binary_predicates.ipynb cuproj_benchmark.ipynb"
+SKIPNBS="binary_predicates.ipynb cuproj_benchmark.ipynb nyc_taxi_years_correlation.ipynb"
 
 EXITCODE=0
 trap "EXITCODE=1" ERR
 
 set +e
-for nb in $(find . -name "*.ipynb"); do
-    nbBasename=$(basename ${nb})
-    if (echo " ${SKIPNBS} " | grep -q " ${nbBasename} "); then
-        echo "--------------------------------------------------------------------------------"
-        echo "SKIPPING: ${nb} (listed in skip list)"
-        echo "--------------------------------------------------------------------------------"
-    else
-        nvidia-smi
-        ${NBTEST} ${nbBasename}
-    fi
-done
+
+test_notebooks() {
+    for nb in $(find . -name "*.ipynb"); do
+        nbBasename=$(basename ${nb})
+        if (echo " ${SKIPNBS} " | grep -q " ${nbBasename} "); then
+            echo "--------------------------------------------------------------------------------"
+            echo "SKIPPING: ${nb} (listed in skip list)"
+            echo "--------------------------------------------------------------------------------"
+        else
+            nvidia-smi
+            ${NBTEST} "${nb}"
+        fi
+    done
+}
+
+# test notebooks in notebooks/
+pushd notebooks
+test_notebooks
+popd
+
+# test notebooks in docs/
+pushd docs
+test_notebooks
+popd
 
 rapids-logger "Notebook test script exiting with value: $EXITCODE"
 exit ${EXITCODE}

ci/utils/nbtest.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
-# Copyright (c) 2023, NVIDIA CORPORATION.
+# Copyright (c) 2023-2024, NVIDIA CORPORATION.
+
+set -e -u -o pipefail
 
 MAGIC_OVERRIDE_CODE="
 def my_run_line_magic(*args, **kwargs):
@@ -22,8 +24,7 @@ get_ipython().run_cell_magic=my_run_cell_magic
 "
 
 NO_COLORS=--colors=NoColor
-NBTMPDIR="$WORKSPACE/tmp"
-mkdir -p ${NBTMPDIR}
+NBTMPDIR="$(mktemp -d)"
 
 EXITCODE=0
 trap "EXITCODE=1" ERR

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

@@ -19,6 +19,7 @@ dependencies:
 - cython>=3.0.0
 - doxygen
 - gcc_linux-64=11.*
+- geopandas<1
 - geopandas>=0.11.0
 - ipython
 - ipywidgets
@@ -33,6 +34,7 @@ dependencies:
 - numpy>=1.23,<2.0a0
 - numpydoc
 - nvcc_linux-64=11.8
+- osmnx>=1.9.3
 - pre-commit
 - proj
 - pydata-sphinx-theme!=0.14.2

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

@@ -22,6 +22,7 @@ dependencies:
 - cython>=3.0.0
 - doxygen
 - gcc_linux-64=11.*
+- geopandas<1
 - geopandas>=0.11.0
 - ipython
 - ipywidgets
@@ -35,6 +36,7 @@ dependencies:
 - notebook
 - numpy>=1.23,<2.0a0
 - numpydoc
+- osmnx>=1.9.3
 - pre-commit
 - proj
 - pydata-sphinx-theme!=0.14.2

dependencies.yaml

@@ -20,6 +20,7 @@ files:
       - rapids_build_skbuild
       - run_python_cuspatial
       - test_libcuspatial
+      - test_notebooks
       - test_python_cuspatial
       - test_python_cuproj
       - notebooks
@@ -345,6 +346,9 @@ dependencies:
       - output_types: [conda, requirements, pyproject]
         packages:
           - geopandas<1
+      - output_types: conda
+        packages:
+          - osmnx>=1.9.3
   py_version:
     specific:
       - output_types: conda