bump to 2024.4, remove version locks on all packages, replace pygeos …

…with shapely

Dockerfile

@@ -6,7 +6,7 @@ LABEL maintainer="UC San Diego ITS/ETS <[email protected]>"
 USER root
 
 ######################### ##
-# Requested for DSC170 WI23
+# Requested for DSC170 WI25
 COPY requirements.txt /home/jovyan
 
 RUN apt update -y && \
@@ -20,31 +20,26 @@ RUN pip uninstall pillow fiona -y && \
     pip install -r ~/requirements.txt && \
     pip install --upgrade fiona
 
+# pygeos is deprecated and has been merged with shapely. (pygeos works around python GIL)
+# https://github.com/shapely/shapely
 RUN mamba install -c conda-forge -y \
-    python=3.10 \
-    geopandas=0.13.2 \
-    cartopy=0.21.1 \
-    pygeos=0.14 \
-    pysal=2.7.0 \
-    contextily=1.3.0 \
-    osmnx=1.3.0 \
-    jupyterlab_widgets=3.0.7
+    geopandas \
+    cartopy \
+    shapely \
+    pysal \
+    contextily \
+    osmnx \
+    jupyterlab_widgets
 
-RUN mamba install -c esri arcgis=2.2.0 -y && \
-    mamba update arcgis -y
+RUN mamba install -c esri arcgis -y
 
-RUN mamba install numpy -y && \
-    mamba update numpy -y
+RUN mamba install numpy -y
 
 RUN pip install --upgrade pip setuptools wheel
 RUN pip install --upgrade nbconvert
 
 # RUN mamba install -c conda-forge geopandas cartopy pygeos pysal contextily osmnx jupyterlab_widgets -y
 
-RUN jupyter nbextension enable --py widgetsnbextension --sys-prefix && \
-	jupyter labextension install @jupyter-widgets/jupyterlab-manager && \
-	jupyter labextension install [email protected]
-
 USER $NB_UID
 
 COPY arcgis_test.ipynb /opt

requirements.txt

@@ -1,5 +1,5 @@
-pillow==9.1
-pyproj==3.3 
+pillow
+pyproj
 openpyxl 
 cenpy 
 python-Levenshtein 
@@ -10,9 +10,9 @@ keplergl
 mesa-geo 
 mesa 
 matplotlib 
-jupyterlab==2.3.1 
-shapely==2.0.0 
-pyshp==2.3.1 
-pandas==1.5.2 
+jupyterlab
+shapely
+pyshp
+pandas
 censusdata 
 graphviz