[SEDONA-553] Update Sedona docker to use newer GeoPandas (#1418)

* Update docker and notebooks * Do not check requirement.txt
apache · May 19, 2024 · b4cec4b · b4cec4b
1 parent 30308e6
commit b4cec4b
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 14 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -53,8 +53,6 @@ repos:
       - id: forbid-submodules
       - id: mixed-line-ending
         exclude: \.csv$
-      - id: requirements-txt-fixer
-        files: ^docker/sedona-spark-jupyterlab/requirements\.txt$
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
         exclude: ^docs-overrides/main\.html$|\.Rd$

diff --git a/docker/sedona-spark-jupyterlab/requirements.txt b/docker/sedona-spark-jupyterlab/requirements.txt
@@ -1,12 +1,13 @@
 attrs
 descartes
 fiona==1.8.22
-geopandas==0.11.1
+pandas==1.5.3
+shapely==2.0.4
+geopandas==0.14.4
 ipykernel
 ipywidgets
 jupyterlab==3.6.4
 jupyterlab-widgets==1.1.7
 keplergl==0.3.2
 matplotlib
-pandas==1.3.5
 pydeck==0.8.0
diff --git a/docs/usecases/ApacheSedonaCore.ipynb b/docs/usecases/ApacheSedonaCore.ipynb
@@ -146,7 +146,6 @@
     "           'org.apache.sedona:sedona-spark-3.4_2.12:1.5.1,'\n",
     "           'org.datasyslab:geotools-wrapper:1.5.1-28.2,'\n",
     "           'uk.co.gresearch.spark:spark-extension_2.12:2.11.0-3.4'). \\\n",
-    "    config('spark.jars.repositories', 'https://artifacts.unidata.ucar.edu/repository/unidata-all'). \\\n",
     "    getOrCreate()\n",
     "\n",
     "sedona = SedonaContext.create(config)"

diff --git a/docs/usecases/ApacheSedonaRaster.ipynb b/docs/usecases/ApacheSedonaRaster.ipynb
@@ -202,7 +202,6 @@
     "           'org.apache.sedona:sedona-spark-3.4_2.12:1.5.1,'\n",
     "           'org.datasyslab:geotools-wrapper:1.5.1-28.2,'\n",
     "           'uk.co.gresearch.spark:spark-extension_2.12:2.11.0-3.4'). \\\n",
-    "    config('spark.jars.repositories', 'https://artifacts.unidata.ucar.edu/repository/unidata-all'). \\\n",
     "    getOrCreate()\n",
     "\n",
     "sedona = SedonaContext.create(config)\n",

diff --git a/docs/usecases/ApacheSedonaSQL.ipynb b/docs/usecases/ApacheSedonaSQL.ipynb
@@ -144,7 +144,6 @@
     "           'org.apache.sedona:sedona-spark-3.4_2.12:1.5.1,'\n",
     "           'org.datasyslab:geotools-wrapper:1.5.1-28.2,'\n",
     "           'uk.co.gresearch.spark:spark-extension_2.12:2.11.0-3.4'). \\\n",
-    "    config('spark.jars.repositories', 'https://artifacts.unidata.ucar.edu/repository/unidata-all'). \\\n",
     "    getOrCreate()\n",
     "\n",
     "sedona = SedonaContext.create(config)\n"

diff --git a/docs/usecases/ApacheSedonaSQL_SpatialJoin_AirportsPerCountry.ipynb b/docs/usecases/ApacheSedonaSQL_SpatialJoin_AirportsPerCountry.ipynb
@@ -58,7 +58,6 @@
     "           'org.apache.sedona:sedona-spark-shaded-3.4_2.12:1.5.1,'\n",
     "           'org.datasyslab:geotools-wrapper:1.5.1-28.2,'\n",
     "           'uk.co.gresearch.spark:spark-extension_2.12:2.11.0-3.4'). \\\n",
-    "    config('spark.jars.repositories', 'https://artifacts.unidata.ucar.edu/repository/unidata-all'). \\\n",
     "    getOrCreate()\n",
     "\n",
     "sedona = SedonaContext.create(config)\n",

diff --git a/docs/usecases/Pipfile b/docs/usecases/Pipfile
@@ -11,12 +11,12 @@ mkdocs="*"
 pytest-cov = "*"
 
 [packages]
-pandas="1.3.5"
-shapely="==1.8.4"
-geopandas="==0.11.1"
+pandas="1.5.3"
+shapely="==2.0.4"
+geopandas="==0.14.4"
 pyspark="==3.4.0"
 attrs="*"
-apache-sedona="==1.5.1"
+apache-sedona="==1.6.0"
 matplotlib = "*"
 descartes = "*"
 keplergl = "==0.3.2"

diff --git a/docs/usecases/Sedona_OvertureMaps_GeoParquet.ipynb b/docs/usecases/Sedona_OvertureMaps_GeoParquet.ipynb
@@ -70,7 +70,7 @@
    },
    "outputs": [],
    "source": [
-    "DATA_LINK = \"s3a://wherobots-public-data/overturemaps-us-west-2/release/2023-07-26-alpha.0/\""
+    "DATA_LINK = \"s3a://wherobots-examples/data/overturemaps-us-west-2/release/2023-07-26-alpha.0/\""
    ]
   },
   {
@@ -219,7 +219,6 @@
     "           'org.apache.sedona:sedona-spark-3.4_2.12:1.5.1,'\n",
     "           'org.datasyslab:geotools-wrapper:1.5.1-28.2,'\n",
     "           'uk.co.gresearch.spark:spark-extension_2.12:2.11.0-3.4'). \\\n",
-    "    config('spark.jars.repositories', 'https://artifacts.unidata.ucar.edu/repository/unidata-all'). \\\n",
     "    getOrCreate()\n",
     "\n",
     "sedona = SedonaContext.create(config)"