Fix import orders

docker/sedona-spark-jupyterlab/requirements.txt

@@ -2,7 +2,6 @@ attrs
 descartes
 fiona==1.8.22
 geopandas==0.14.4
-rasterio==1.3.11
 ipykernel
 ipywidgets
 jupyterlab==3.6.4
@@ -12,4 +11,5 @@ matplotlib
 numpy<2
 pandas==1.5.3
 pydeck==0.8.0
+rasterio==1.3.11
 shapely==2.0.4

python/sedona/core/SpatialRDD/linestring_rdd.py

@@ -16,7 +16,6 @@
 #  under the License.
 
 from pyspark import RDD, SparkContext, StorageLevel
-
 from sedona.core.enums import FileDataSplitter
 from sedona.core.enums.file_data_splitter import FileSplitterJvm
 from sedona.core.jvm.translate import PythonRddToJavaRDDAdapter

python/sedona/core/SpatialRDD/point_rdd.py

@@ -16,7 +16,6 @@
 #  under the License.
 
 from pyspark import RDD, SparkContext, StorageLevel
-
 from sedona.core.enums.file_data_splitter import FileDataSplitter, FileSplitterJvm
 from sedona.core.jvm.translate import PythonRddToJavaRDDAdapter
 from sedona.core.SpatialRDD.spatial_rdd import JvmSpatialRDD, SpatialRDD

python/sedona/core/SpatialRDD/polygon_rdd.py

@@ -16,7 +16,6 @@
 #  under the License.
 
 from pyspark import RDD, SparkContext, StorageLevel
-
 from sedona.core.enums.file_data_splitter import FileDataSplitter, FileSplitterJvm
 from sedona.core.jvm.translate import PythonRddToJavaRDDAdapter
 from sedona.core.SpatialRDD.spatial_rdd import JvmSpatialRDD, SpatialRDD

python/sedona/core/SpatialRDD/rectangle_rdd.py

@@ -16,7 +16,6 @@
 #  under the License.
 
 from pyspark import RDD, SparkContext, StorageLevel
-
 from sedona.core.enums.file_data_splitter import FileDataSplitter, FileSplitterJvm
 from sedona.core.SpatialRDD.spatial_rdd import JvmSpatialRDD, SpatialRDD
 from sedona.core.SpatialRDD.spatial_rdd_factory import SpatialRDDFactory

python/sedona/core/SpatialRDD/spatial_rdd.py

@@ -22,7 +22,6 @@
 from py4j.java_gateway import get_field
 from pyspark import RDD, SparkContext, StorageLevel
 from pyspark.sql import SparkSession
-
 from sedona.core.enums.grid_type import GridType, GridTypeJvm
 from sedona.core.enums.index_type import IndexType, IndexTypeJvm
 from sedona.core.enums.spatial import SpatialType

python/sedona/core/SpatialRDD/spatial_rdd_factory.py

@@ -19,7 +19,6 @@
 
 import attr
 from pyspark import SparkContext
-
 from sedona.utils.decorators import require
 
 

python/sedona/core/enums/file_data_splitter.py

@@ -18,7 +18,6 @@
 from enum import Enum
 
 import attr
-
 from sedona.core.jvm.abstract import JvmObject
 from sedona.utils.decorators import require
 

python/sedona/core/enums/grid_type.py

@@ -18,7 +18,6 @@
 from enum import Enum
 
 import attr
-
 from sedona.core.jvm.abstract import JvmObject
 from sedona.utils.decorators import require
 

python/sedona/core/enums/index_type.py

@@ -18,7 +18,6 @@
 from enum import Enum
 
 import attr
-
 from sedona.core.jvm.abstract import JvmObject
 from sedona.utils.decorators import require
 

python/sedona/core/formatMapper/disc_utils.py

@@ -18,7 +18,6 @@
 from enum import Enum
 
 from pyspark import SparkContext
-
 from sedona.core.jvm.translate import SpatialObjectLoaderAdapter
 from sedona.core.SpatialRDD import LineStringRDD, PointRDD, PolygonRDD, SpatialRDD
 from sedona.utils.decorators import require

python/sedona/core/formatMapper/geo_json_reader.py

@@ -16,7 +16,6 @@
 #  under the License.
 
 from pyspark import RDD, SparkContext
-
 from sedona.core.formatMapper.geo_reader import GeoDataReader
 from sedona.core.SpatialRDD.spatial_rdd import SpatialRDD
 from sedona.utils.meta import MultipleMeta

python/sedona/core/formatMapper/geo_reader.py

@@ -18,7 +18,6 @@
 import abc
 
 import attr
-
 from sedona.utils.meta import MultipleMeta
 
 

python/sedona/core/formatMapper/shapefileParser/shape_file_reader.py

@@ -17,7 +17,6 @@
 
 import attr
 from pyspark import SparkContext
-
 from sedona.core.formatMapper.geo_reader import GeoDataReader
 from sedona.core.SpatialRDD import LineStringRDD, PointRDD, PolygonRDD
 from sedona.core.SpatialRDD.spatial_rdd import SpatialRDD

python/sedona/core/formatMapper/wkb_reader.py

@@ -16,7 +16,6 @@
 #  under the License.
 
 from pyspark import RDD, SparkContext
-
 from sedona.core.formatMapper.geo_reader import GeoDataReader
 from sedona.core.SpatialRDD import SpatialRDD
 from sedona.utils.meta import MultipleMeta

python/sedona/core/formatMapper/wkt_reader.py

@@ -16,7 +16,6 @@
 #  under the License.
 
 from pyspark import RDD, SparkContext
-
 from sedona.core.formatMapper.geo_reader import GeoDataReader
 from sedona.core.SpatialRDD.spatial_rdd import SpatialRDD
 from sedona.utils.meta import MultipleMeta

python/sedona/core/geom/shapely1/circle.py

@@ -17,6 +17,7 @@
 
 from math import sqrt
 
+from sedona.core.geom.envelope import Envelope
 from shapely.geometry import (
     LineString,
     MultiLineString,
@@ -27,8 +28,6 @@
 )
 from shapely.geometry.base import BaseGeometry
 
-from sedona.core.geom.envelope import Envelope
-
 
 class Circle(Polygon):
 

python/sedona/core/geom/shapely1/envelope.py

@@ -18,11 +18,10 @@
 import math
 import pickle
 
+from sedona.utils.decorators import require
 from shapely.geometry import Point, Polygon
 from shapely.geometry.base import BaseGeometry
 
-from sedona.utils.decorators import require
-
 
 class Envelope(Polygon):
 

python/sedona/core/geom/shapely2/circle.py

@@ -17,6 +17,7 @@
 
 from math import sqrt
 
+from sedona.core.geom.envelope import Envelope
 from shapely.geometry import (
     LineString,
     MultiLineString,
@@ -28,8 +29,6 @@
 )
 from shapely.geometry.base import BaseGeometry
 
-from sedona.core.geom.envelope import Envelope
-
 
 class Circle(Polygon):
 

python/sedona/core/geom/shapely2/envelope.py

@@ -18,11 +18,10 @@
 import math
 import pickle
 
+from sedona.utils.decorators import require
 from shapely.geometry import Polygon, box
 from shapely.geometry.base import BaseGeometry
 
-from sedona.utils.decorators import require
-
 
 class Envelope(Polygon):
 

python/sedona/core/jvm/config.py

@@ -25,7 +25,6 @@
 
 from py4j.protocol import Py4JJavaError
 from pyspark.sql import SparkSession
-
 from sedona.utils.decorators import classproperty
 
 string_types = (type(b""), type(""))

python/sedona/core/spatialOperator/join_params.py

@@ -16,7 +16,6 @@
 #  under the License.
 
 import attr
-
 from sedona.core.enums import IndexType
 from sedona.core.enums.join_build_side import JoinBuildSide
 from sedona.core.jvm.abstract import JvmObject

python/sedona/core/spatialOperator/join_query.py

@@ -16,7 +16,6 @@
 #  under the License.
 
 from pyspark import RDD
-
 from sedona.core.spatialOperator.join_params import JoinParams
 from sedona.core.spatialOperator.join_query_raw import JoinQueryRaw
 from sedona.core.SpatialRDD.spatial_rdd import SpatialRDD

python/sedona/core/spatialOperator/knn_query.py

@@ -16,14 +16,13 @@
 #  under the License.
 
 import attr
-from shapely.geometry.base import BaseGeometry
-
 from sedona.core.jvm.translate import JvmSedonaPythonConverter
 from sedona.core.SpatialRDD.spatial_rdd import SpatialRDD
 from sedona.utils.binary_parser import BinaryParser
 from sedona.utils.decorators import require
 from sedona.utils.geometry_adapter import GeometryAdapter
 from sedona.utils.spatial_rdd_parser import SpatialRDDParserData
+from shapely.geometry.base import BaseGeometry
 
 
 @attr.s

python/sedona/core/spatialOperator/range_query.py

@@ -15,11 +15,10 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from shapely.geometry.base import BaseGeometry
-
 from sedona.core.spatialOperator.range_query_raw import RangeQueryRaw
 from sedona.core.SpatialRDD.spatial_rdd import SpatialRDD
 from sedona.utils.decorators import require
+from shapely.geometry.base import BaseGeometry
 
 
 class RangeQuery:

python/sedona/core/spatialOperator/range_query_raw.py

@@ -15,12 +15,11 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from shapely.geometry.base import BaseGeometry
-
 from sedona.core.spatialOperator.rdd import SedonaPairRDD, SedonaRDD
 from sedona.core.SpatialRDD.spatial_rdd import SpatialRDD
 from sedona.utils.decorators import require
 from sedona.utils.geometry_adapter import GeometryAdapter
+from shapely.geometry.base import BaseGeometry
 
 
 class RangeQueryRaw:

python/sedona/core/spatialOperator/rdd.py

@@ -16,7 +16,6 @@
 #  under the License.
 
 from pyspark import RDD, SparkContext
-
 from sedona.core.jvm.translate import JvmSedonaPythonConverter
 from sedona.utils.spatial_rdd_parser import SedonaPickler
 

python/sedona/maps/SedonaPyDeck.py

@@ -26,7 +26,6 @@
     LongType,
     ShortType,
 )
-
 from sedona.maps.SedonaMapUtils import SedonaMapUtils
 
 

python/sedona/register/geo_registrator.py

@@ -18,7 +18,6 @@
 import attr
 from py4j.java_gateway import java_import
 from pyspark.sql import SparkSession
-
 from sedona.core.jvm.config import deprecated
 from sedona.register.java_libs import SedonaJvmLib
 from sedona.utils.prep import assign_all

python/sedona/spark/SedonaContext.py

@@ -17,7 +17,6 @@
 
 import attr
 from pyspark.sql import SparkSession
-
 from sedona.register.geo_registrator import PackageImporter
 from sedona.utils import KryoSerializer, SedonaKryoRegistrator
 

python/sedona/sql/st_aggregates.py

@@ -19,7 +19,6 @@
 from functools import partial
 
 from pyspark.sql import Column
-
 from sedona.sql.dataframe_api import (
     ColumnOrName,
     call_sedona_function,

python/sedona/sql/st_constructors.py

@@ -20,7 +20,6 @@
 from typing import Optional, Union
 
 from pyspark.sql import Column
-
 from sedona.sql.dataframe_api import (
     ColumnOrName,
     ColumnOrNameOrNumber,

python/sedona/sql/st_functions.py

@@ -20,7 +20,6 @@
 from typing import Optional, Union
 
 from pyspark.sql import Column
-
 from sedona.sql.dataframe_api import (
     ColumnOrName,
     ColumnOrNameOrNumber,

python/sedona/sql/st_predicates.py

@@ -20,7 +20,6 @@
 from typing import Optional, Union
 
 from pyspark.sql import Column
-
 from sedona.sql.dataframe_api import (
     ColumnOrName,
     call_sedona_function,

python/sedona/utils/adapter.py

@@ -19,7 +19,6 @@
 
 from pyspark import RDD
 from pyspark.sql import DataFrame, SparkSession
-
 from sedona.core.enums.spatial import SpatialType
 from sedona.core.spatialOperator.rdd import SedonaPairRDD, SedonaRDD
 from sedona.core.SpatialRDD.spatial_rdd import SpatialRDD

python/sedona/utils/geometry_adapter.py

@@ -15,11 +15,10 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from shapely.geometry.base import BaseGeometry
-
 from sedona.core.geom.envelope import Envelope
 from sedona.core.jvm.translate import JvmGeometryAdapter
 from sedona.utils.spatial_rdd_parser import GeometryFactory
+from shapely.geometry.base import BaseGeometry
 
 
 class GeometryAdapter:

python/sedona/utils/jvm.py

@@ -16,7 +16,6 @@
 #  under the License.
 
 import attr
-
 from sedona.core.jvm.abstract import JvmObject
 from sedona.utils.decorators import require
 

python/sedona/utils/spatial_rdd_parser.py

@@ -28,10 +28,9 @@
 except ImportError:
     from pyspark import PickleSerializer as CPickleSerializer
 
-from shapely.wkb import dumps
-
 from sedona.core.geom.circle import Circle
 from sedona.utils.binary_parser import BinaryParser
+from shapely.wkb import dumps
 
 
 class GeoData:

python/setup.py

@@ -17,9 +17,8 @@
 
 import os
 
-from setuptools import Extension, find_packages, setup
-
 from sedona import version
+from setuptools import Extension, find_packages, setup
 
 with open("README.md", "r") as fh:
     long_description = fh.read()

python/tests/core/test_avoiding_python_jvm_serde_df.py

@@ -17,10 +17,6 @@
 import os
 
 from pyspark.sql.types import StructField, StructType
-from shapely.wkt import loads
-from tests.test_base import TestBase
-from tests.tools import tests_resource
-
 from sedona.core.enums import GridType, IndexType
 from sedona.core.formatMapper import WktReader
 from sedona.core.spatialOperator.join_params import JoinParams
@@ -29,6 +25,9 @@
 from sedona.core.SpatialRDD import CircleRDD
 from sedona.sql.types import GeometryType
 from sedona.utils.adapter import Adapter
+from shapely.wkt import loads
+from tests.test_base import TestBase
+from tests.tools import tests_resource
 
 bank_csv_path = os.path.join(tests_resource, "small/points.csv")
 areas_csv_path = os.path.join(tests_resource, "small/areas.csv")