From ac08893fdad8943b6686234c501dc1b90c3bd422 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Fri, 8 Mar 2024 14:39:26 -0800 Subject: [PATCH 1/2] Ensure only matches the string --- python/cudf/cudf/core/column/column.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python/cudf/cudf/core/column/column.py b/python/cudf/cudf/core/column/column.py index b7080ff7a7c..3e0ec4b5cd7 100644 --- a/python/cudf/cudf/core/column/column.py +++ b/python/cudf/cudf/core/column/column.py @@ -975,9 +975,12 @@ def astype(self, dtype: Dtype, copy: bool = False) -> ColumnBase: # TODO: Figure out why `cudf.dtype("category")` # astype's different than just the string return col.as_categorical_column(dtype) - elif dtype == "interval" and isinstance( - self.dtype, cudf.IntervalDtype + elif ( + isinstance(dtype, str) + and dtype == "interval" + and isinstance(self.dtype, cudf.IntervalDtype) ): + # astype("interval") (the string only) should no-op return col was_object = dtype == object or dtype == np.dtype(object) dtype = cudf.dtype(dtype) From 6ec3c00f4208d7972a035b67411c31adbead5fd6 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Sun, 10 Mar 2024 10:31:59 -0500 Subject: [PATCH 2/2] Temporarily disable docs errors. --- ci/build_docs.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index b94c61cc184..4b6391be82c 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -34,6 +34,11 @@ rapids-mamba-retry install \ export RAPIDS_DOCS_DIR="$(mktemp -d)" +# TODO: Disable hard errors until the docs site is accessible (network problems) +EXITCODE=0 +trap "EXITCODE=1" ERR +set +e + rapids-logger "Build CPP docs" pushd cpp/doxygen aws s3 cp s3://rapidsai-docs/librmm/html/${RAPIDS_VERSION_NUMBER}/rmm.tag . || echo "Failed to download rmm Doxygen tag" @@ -66,4 +71,11 @@ if [[ "${RAPIDS_BUILD_TYPE}" != "pull-request" ]]; then fi popd -rapids-upload-docs +if [[ "${EXITCODE}" == "0" ]]; then + rapids-upload-docs +else + rapids-logger "Docs script had errors resulting in exit code $EXITCODE" +fi + +# TODO: Disable hard errors until the docs site is accessible (network problems) +exit 0