GDAL and Scala path updates.

Author: metasim

project/RFAssemblyPlugin.scala

@@ -51,6 +51,7 @@ object RFAssemblyPlugin extends AutoPlugin {
     assembly / assemblyShadeRules:= {
       val shadePrefixes = Seq(
         "shapeless",
+        "com.github.mpilquist",
         "com.amazonaws",
         "org.apache.avro",
         "org.apache.http",

pyrasterframes/src/main/python/pyrasterframes/pyproject.toml

@@ -0,0 +1,4 @@
+[build-system]
+# Minimum requirements for the build system to execute.
+requires = ["setuptools", "wheel"]  # PEP 508 specifications.
+build-backend = "setuptools.build_meta"

pyrasterframes/src/main/python/pyrasterframes/utils.py

@@ -52,7 +52,7 @@ def pdir(curr):
         # See if we're running outside of sbt build and adjust
         if os.path.basename(target_dir) != "target":
             target_dir = os.path.join(pdir(pdir(target_dir)), 'target')
-        jar_dir = os.path.join(target_dir, 'scala-2.11')
+        jar_dir = os.path.join(target_dir, 'scala-2.12')
 
     return os.path.realpath(jar_dir)
 

pyrasterframes/src/main/python/pyrasterframes/version.py

@@ -20,4 +20,4 @@
 #
 
 # Translating Java version from version.sbt to PEP440 norms
-__version__: str = '0.9.1'
+__version__: str = '0.9.2'

pyrasterframes/src/main/python/requirements-condaforge.txt

@@ -1,4 +1,4 @@
 # These packages should be installed from conda-forge, given their complex binary components.
-gdal==2.4.4
+gdal==3.1.2
 rasterio[s3]
 rtree

pyrasterframes/src/main/python/setup.py

@@ -140,15 +140,14 @@ def dest_file(self, src_file):
 # to throw a `NotImplementedError: Can't perform this operation for unregistered loader type`
 pytest = 'pytest>=4.0.0,<5.0.0'
 
-
 pyspark = 'pyspark==3.1.1'
 boto3 = 'boto3'
 deprecation = 'deprecation'
 descartes = 'descartes'
 matplotlib = 'matplotlib'
 fiona = 'fiona'
 folium = 'folium'
-gdal = 'gdal==2.4.4'
+gdal = 'gdal==3.1.2'
 geopandas = 'geopandas'
 ipykernel = 'ipykernel'
 ipython = 'ipython'
@@ -185,7 +184,7 @@ def dest_file(self, src_file):
         'Bug Reports': 'https://github.com/locationtech/rasterframes/issues',
         'Source': 'https://github.com/locationtech/rasterframes',
     },
-    python_requires=">=3.5",
+    python_requires=">=3.7",
     install_requires=[
         gdal,
         pytz,

pyrasterframes/src/main/python/tests/__init__.py

@@ -51,7 +51,7 @@ def pdir(curr):
         return os.path.dirname(curr)
 
     here = os.path.dirname(os.path.realpath(__file__))
-    scala_target = os.path.realpath(os.path.join(pdir(pdir(here)), 'scala-2.11'))
+    scala_target = os.path.realpath(os.path.join(pdir(pdir(here)), 'scala-2.12'))
     rez_dir = os.path.realpath(os.path.join(scala_target, 'test-classes'))
     # If not running in build mode, try source dirs.
     if not os.path.exists(rez_dir):

rf-notebook/src/main/docker/requirements-nb.txt

@@ -1,5 +1,5 @@
-pyspark>=2.4.7,<=3.0
-gdal==2.4.4
+pyspark>=3.1
+gdal==3.1.2
 numpy
 pandas
 shapely