Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test notebooks in 'docs/', make cuspatial_api_examples self-contained, skip long-running notebook, fix some docs #1407

Merged
merged 6 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
38 changes: 25 additions & 13 deletions ci/test_notebooks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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} ${nbBasename}
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}
2 changes: 2 additions & 0 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ dependencies:
- cython>=3.0.0
- doxygen
- gcc_linux-64=11.*
- geopandas<1
- geopandas>=0.11.0
- ipython
- ipywidgets
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions conda/environments/all_cuda-122_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ dependencies:
- cython>=3.0.0
- doxygen
- gcc_linux-64=11.*
- geopandas<1
- geopandas>=0.11.0
- ipython
- ipywidgets
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ files:
- rapids_build_skbuild
- run_python_cuspatial
- test_libcuspatial
- test_notebooks
- test_python_cuspatial
- test_python_cuproj
- notebooks
Expand Down Expand Up @@ -341,6 +342,9 @@ dependencies:
- output_types: [conda, requirements, pyproject]
packages:
- geopandas<1
- output_types: conda
packages:
- osmnx>=1.9.3
py_version:
specific:
- output_types: conda
Expand Down
Loading
Loading