From 119150f3e554490c7305f3e9fb7edeb3ec83e133 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:12:13 -0700 Subject: [PATCH] Remove unused shuffle_order in GeoColumn --- python/cuspatial/cuspatial/core/_column/geocolumn.py | 8 ++++---- python/cuspatial/cuspatial/core/geodataframe.py | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/python/cuspatial/cuspatial/core/_column/geocolumn.py b/python/cuspatial/cuspatial/core/_column/geocolumn.py index d32d75465..ca73822b5 100644 --- a/python/cuspatial/cuspatial/core/_column/geocolumn.py +++ b/python/cuspatial/cuspatial/core/_column/geocolumn.py @@ -1,8 +1,9 @@ # Copyright (c) 2021-2024, NVIDIA CORPORATION +from __future__ import annotations from enum import Enum from functools import cached_property -from typing import Tuple, TypeVar +from typing import TypeVar import cupy as cp import pyarrow as pa @@ -41,9 +42,8 @@ class GeoColumn(ColumnBase): def __init__( self, - data: Tuple, + data: tuple[cudf.Series, cudf.Series, cudf.Series, cudf.Series], meta: GeoMeta = None, - shuffle_order: cudf.Index = None, ): if ( isinstance(data[0], cudf.Series) @@ -61,7 +61,7 @@ def __init__( self.polygons = data[3] self.polygons.name = "polygons" else: - raise TypeError("All four Tuple arguments must be cudf.ListSeries") + raise TypeError("All four Tuple arguments must be cudf.Series") super().__init__(None, size=len(self), dtype="geometry") def to_arrow(self): diff --git a/python/cuspatial/cuspatial/core/geodataframe.py b/python/cuspatial/cuspatial/core/geodataframe.py index ef73b3487..7d34ae4ed 100644 --- a/python/cuspatial/cuspatial/core/geodataframe.py +++ b/python/cuspatial/cuspatial/core/geodataframe.py @@ -134,7 +134,6 @@ def _copy_type_metadata( other_col.polygons, ), other_col._meta, - cudf.Index(col), ) type_copied._data.set_by_label(name, col, validate=False)