From bbb89418f68cce435024b9921e142b46ce857d20 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 1 Aug 2024 08:59:33 -0500 Subject: [PATCH 1/5] ensure notebook-testing script fails when notebooks fail --- ci/test_notebooks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index 44353684a..c6cba4a15 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright (c) 2020-2024, NVIDIA CORPORATION. -set -euo pipefail +set -eEuo pipefail . /opt/conda/etc/profile.d/conda.sh From b8994bf42c7932405df2a2e11f3d5ecce01f9b1f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 1 Aug 2024 13:42:26 -0500 Subject: [PATCH 2/5] skip ZipCodes_Stops_PIP_cuSpatial.ipynb --- ci/test_notebooks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index c6cba4a15..776d58b25 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -29,7 +29,7 @@ NBTEST="$(realpath "$(dirname "$0")/utils/nbtest.sh")" # 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 ZipCodes_Stops_PiP_cuSpatial.ipynb" EXITCODE=0 trap "EXITCODE=1" ERR From 7ca2cd72f7bd8681b5d7007db2ad77266e16b62e Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 2 Aug 2024 15:32:57 -0500 Subject: [PATCH 3/5] fix error in nyc_taxi_years_correlation notebook --- notebooks/nyc_taxi_years_correlation.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebooks/nyc_taxi_years_correlation.ipynb b/notebooks/nyc_taxi_years_correlation.ipynb index d13ce0d3b..f844acb8c 100644 --- a/notebooks/nyc_taxi_years_correlation.ipynb +++ b/notebooks/nyc_taxi_years_correlation.ipynb @@ -130,7 +130,7 @@ "taxi_zone_rings = cuspatial.GeoSeries.from_polygons_xy(\n", " polygons_xy=taxi_zones.polygons.xy,\n", " ring_offset=taxi_zones.polygons.ring_offset,\n", - " part_offsets=taxi_zones.polygons.part_offset,\n", + " part_offset=taxi_zones.polygons.part_offset,\n", " geometry_offsets=cudf.Series(range(len(taxi_zones.polygons.part_offset)))\n", ")" ] From 96ff6b846ac021ff0b2ed2eafa0bb31f1454d6a2 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 2 Aug 2024 16:13:36 -0500 Subject: [PATCH 4/5] geometry_offset (singular) --- notebooks/nyc_taxi_years_correlation.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebooks/nyc_taxi_years_correlation.ipynb b/notebooks/nyc_taxi_years_correlation.ipynb index f844acb8c..d1c377e6c 100644 --- a/notebooks/nyc_taxi_years_correlation.ipynb +++ b/notebooks/nyc_taxi_years_correlation.ipynb @@ -131,7 +131,7 @@ " polygons_xy=taxi_zones.polygons.xy,\n", " ring_offset=taxi_zones.polygons.ring_offset,\n", " part_offset=taxi_zones.polygons.part_offset,\n", - " geometry_offsets=cudf.Series(range(len(taxi_zones.polygons.part_offset)))\n", + " geometry_offset=cudf.Series(range(len(taxi_zones.polygons.part_offset)))\n", ")" ] }, From f1a08bb95dff799e42aa5defa1a7308dc7aceec4 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 7 Aug 2024 16:28:50 -0500 Subject: [PATCH 5/5] Update ci/test_notebooks.sh Co-authored-by: jakirkham --- ci/test_notebooks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index 776d58b25..c6cba4a15 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -29,7 +29,7 @@ NBTEST="$(realpath "$(dirname "$0")/utils/nbtest.sh")" # Add notebooks that should be skipped here # (space-separated list of filenames without paths) -SKIPNBS="binary_predicates.ipynb cuproj_benchmark.ipynb ZipCodes_Stops_PiP_cuSpatial.ipynb" +SKIPNBS="binary_predicates.ipynb cuproj_benchmark.ipynb" EXITCODE=0 trap "EXITCODE=1" ERR