From 509cf318e62a01f938d2a0f7cb89f8a866d6b948 Mon Sep 17 00:00:00 2001 From: Stuart Lynn Date: Thu, 12 Oct 2023 15:06:02 +0100 Subject: [PATCH] fixed python `enable_gdal` --- python/mosaic/api/gdal.py | 8 +------- python/setup.cfg | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/python/mosaic/api/gdal.py b/python/mosaic/api/gdal.py index dcebbba52..0887bfc00 100644 --- a/python/mosaic/api/gdal.py +++ b/python/mosaic/api/gdal.py @@ -8,7 +8,6 @@ def setup_gdal( spark: SparkSession, init_script_path: str = "/dbfs/FileStore/geospatial/mosaic/gdal/", - shared_objects_path: str = "/dbfs/FileStore/geospatial/mosaic/gdal/", ) -> None: """ Prepare GDAL init script and shared objects required for GDAL to run on spark. @@ -21,9 +20,6 @@ def setup_gdal( The active SparkSession. init_script_path : str Path to write out the init script for GDAL installation. - shared_objects_path : str - Path to write out shared objects (libgdalalljni.so and libgdalalljni.so.30) that GDAL requires at runtime. - Note: If you dont use the default path you will need to update the generated init script. Returns ------- @@ -34,9 +30,7 @@ def setup_gdal( sc._jvm.com.databricks.labs.mosaic.functions, "MosaicContext" ) mosaicGDALObject = getattr(sc._jvm.com.databricks.labs.mosaic.gdal, "MosaicGDAL") - mosaicGDALObject.prepareEnvironment( - spark._jsparkSession, init_script_path, shared_objects_path - ) + mosaicGDALObject.prepareEnvironment(spark._jsparkSession, init_script_path) print("GDAL setup complete.\n") print(f"Shared objects (*.so) stored in: {shared_objects_path}.\n") print(f"Init script stored in: {init_script_path}.\n") diff --git a/python/setup.cfg b/python/setup.cfg index c19b95a51..d7a7fbe05 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -19,7 +19,7 @@ packages = find: python_requires = >=3.7.0 install_requires = keplergl==0.3.2 - h3==3.7.0 + h3==3.7.3 ipython>=7.22.0 [options.package_data]