From 43618bfaedf6784276be24b75a6433b00cc610ec Mon Sep 17 00:00:00 2001 From: sllynn Date: Fri, 29 Nov 2024 18:03:01 +0000 Subject: [PATCH] gdal_calc python target? --- python/mosaic/api/accessors.py | 2 +- python/mosaic/api/aggregators.py | 2 +- python/mosaic/api/constructors.py | 2 +- python/mosaic/api/predicates.py | 2 +- python/mosaic/api/raster.py | 2 +- python/test/test_mosaic.py | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/python/mosaic/api/accessors.py b/python/mosaic/api/accessors.py index abe1388b5..acb76e17c 100644 --- a/python/mosaic/api/accessors.py +++ b/python/mosaic/api/accessors.py @@ -1,5 +1,5 @@ from pyspark.sql import Column -from pyspark.sql.functions import _to_java_column as pyspark_to_java_column +from pyspark.sql.column import _to_java_column as pyspark_to_java_column from mosaic.config import config from mosaic.utils.types import ColumnOrName diff --git a/python/mosaic/api/aggregators.py b/python/mosaic/api/aggregators.py index ba638f139..93bffa480 100644 --- a/python/mosaic/api/aggregators.py +++ b/python/mosaic/api/aggregators.py @@ -1,5 +1,5 @@ from pyspark.sql import Column -from pyspark.sql.functions import _to_java_column as pyspark_to_java_column +from pyspark.sql.column import _to_java_column as pyspark_to_java_column from mosaic.config import config from mosaic.utils.types import ColumnOrName diff --git a/python/mosaic/api/constructors.py b/python/mosaic/api/constructors.py index f7f21b237..5c69ab1e5 100644 --- a/python/mosaic/api/constructors.py +++ b/python/mosaic/api/constructors.py @@ -1,5 +1,5 @@ from pyspark.sql import Column -from pyspark.sql.functions import _to_java_column as pyspark_to_java_column +from pyspark.sql.column import _to_java_column as pyspark_to_java_column from mosaic.config import config from mosaic.utils.types import ColumnOrName diff --git a/python/mosaic/api/predicates.py b/python/mosaic/api/predicates.py index 9291423b8..53a555af5 100644 --- a/python/mosaic/api/predicates.py +++ b/python/mosaic/api/predicates.py @@ -1,5 +1,5 @@ from pyspark.sql import Column -from pyspark.sql.functions import _to_java_column as pyspark_to_java_column +from pyspark.sql.column import _to_java_column as pyspark_to_java_column from mosaic.config import config from mosaic.utils.types import ColumnOrName diff --git a/python/mosaic/api/raster.py b/python/mosaic/api/raster.py index 0cbe4e38d..84f1549b8 100644 --- a/python/mosaic/api/raster.py +++ b/python/mosaic/api/raster.py @@ -3,7 +3,7 @@ from typing import Any from pyspark.sql import Column -from pyspark.sql.functions import _to_java_column as pyspark_to_java_column +from pyspark.sql.column import _to_java_column as pyspark_to_java_column from pyspark.sql.functions import lit from mosaic.config import config diff --git a/python/test/test_mosaic.py b/python/test/test_mosaic.py index e0ee06601..61912e782 100644 --- a/python/test/test_mosaic.py +++ b/python/test/test_mosaic.py @@ -1,4 +1,5 @@ -from pyspark.sql.functions import _to_java_column, col +from pyspark.sql.functions import col +from pyspark.sql.column import _to_java_column from .context import MosaicContext, MosaicLibraryHandler from .utils import SparkTestCase