Updated rf-notebook package version.

Author: metasim

pyrasterframes/src/main/python/docs/unsupervised-learning.pymd

@@ -20,7 +20,7 @@ We import various Spark components needed to construct our `Pipeline`.
 ```python, imports, echo=True
 import pandas as pd
 from pyrasterframes import TileExploder
-from pyrasterframes.rasterfunctions import rf_assemble_tile, rf_crs, rf_extent, rf_tile, rf_dimensions
+from pyrasterframes.rasterfunctions import *
 
 from pyspark.ml.feature import VectorAssembler
 from pyspark.ml.clustering import KMeans
@@ -40,7 +40,7 @@ catalog_df = pd.DataFrame([
 
 df = spark.read.raster(catalog_df, catalog_col_names=catalog_df.columns)
 df = df.withColumn('crs', rf_crs(df.b1)) \
-       .withColumn('extent', rf_crs(df.b1))
+       .withColumn('extent', rf_extent(df.b1))
 df.printSchema()
 ```
 
@@ -129,5 +129,9 @@ retiled
 The resulting output is shown below.
 
 ```python, viz
-display(retiled.select('prediction').first()['prediction'])
+
+# display(retiled.select('prediction').first()['prediction'])
+from pyrasterframes.rf_types import Extent
+aoi = Extent.from_row(retiled.select(rf_agg_extent('extent')).first()[0])
+retiled.select(rf_agg_overview_raster('prediction', 186, 169, aoi, 'extent', 'crs'))
 ```

pyrasterframes/src/main/python/pyrasterframes/rasterfunctions.py

@@ -349,7 +349,7 @@ def rf_agg_overview_raster(tile_col: Column, cols: int, rows: int, aoi: Extent,
         return Column(jfcn(_to_java_column(tile_col), cols, rows, aoi.__jvm__))
     else:
         return Column(jfcn(
-            _to_java_column(tile_extent_col), _to_java_column(tile_crs_col), _to_java_column(tile_col),
+            _to_java_column(tile_col), _to_java_column(tile_extent_col), _to_java_column(tile_crs_col),
             cols, rows, aoi.__jvm__
         ))
 

pyrasterframes/src/main/python/requirements.txt

@@ -1,9 +1,12 @@
+ipython=6.2.1
+pyspark=2.4.4
+gdal=2.4.3
+numpy>=1.17.3,<2.0
+pandas>=0.25.3,<1.0
+shapely>=1.6.4,<1.7
+rasterio>=1.1.1,<1.2
+folium>=0.10.1,<0.11
+geopandas>=0.6.2,<0.7
+descartes>=1.1.0,<1.2
 pytz
-Shapely>=1.6.0
-pyspark==2.4.4
-numpy>=1.7
-pandas>=0.24.2
-matplotlib<3.0.0  # no python 2.7 support after v2.x.x
-ipython==6.2.1
-rasterio>=1.0.0
-folium  # for documentation
+matplotlib

rf-notebook/src/main/docker/Dockerfile

@@ -1,11 +1,9 @@
 # jupyter/scipy-notebook isn't semantically versioned.
 # We pick this arbitrary one from Sept 2019 because it's what latest was on Oct 17 2019.
-FROM jupyter/scipy-notebook:1386e2046833
+FROM jupyter/scipy-notebook:7a0c7325e470
 
 LABEL maintainer="Astraea, Inc. <[email protected]>"
 
-EXPOSE 4040 4041 4042 4043 4044
-
 USER root
 
 RUN \
@@ -36,21 +34,25 @@ ENV PYTHONPATH $SPARK_HOME/python:$SPARK_HOME/python/lib/py4j-0.10.7-src.zip
 ENV SPARK_OPTS --driver-java-options=-Xms1024M --driver-java-options=-Xmx4096M --driver-java-options=-Dlog4j.logLevel=info
 ENV RF_LIB_LOC=/usr/local/rasterframes
 
-COPY conda_cleanup.sh $RF_LIB_LOC/
+COPY conda_cleanup.sh requirements-nb.txt $RF_LIB_LOC/
 RUN chmod u+x $RF_LIB_LOC/conda_cleanup.sh
 
-ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/conda/lib"
-# Sphinx (for Notebook->html) and pyarrow (from pyspark build)
 RUN \
-    conda install --quiet --yes --channel conda-forge \
-    pyarrow anaconda sphinx nbsphinx shapely numpy folium geopandas geojsonio rasterio descartes && \
+    conda config --set unsatisfiable_hints True && \
+    conda --debug update --channel conda-forge --all --yes --quiet && \
+    conda install --yes --channel conda-forge --file $RF_LIB_LOC/requirements-nb.txt && \
     $RF_LIB_LOC/conda_cleanup.sh $NB_USER $CONDA_DIR
 
+RUN conda list --export
+
+ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/conda/lib"
 COPY *.whl $RF_LIB_LOC/
-COPY jupyter_notebook_config.py $HOME/.jupyter
+COPY jupyter_notebook_config.py $HOME/.jupyter/
 COPY examples $HOME/examples
 
 RUN ls -1 $RF_LIB_LOC/*.whl | xargs pip install --no-cache-dir
 RUN chmod -R +w $HOME/examples && chown -R $NB_UID:$NB_GID $HOME
 
 USER $NB_UID
+
+EXPOSE 4040 4041 4042 4043 4044

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

@@ -0,0 +1,10 @@
+pyspark=2.4.4
+gdal=2.4.3
+numpy>=1.17.3,<2.0
+pandas>=0.25.3,<1.0
+shapely>=1.6.4,<1.7
+rasterio>=1.1.1,<1.2
+folium>=0.10.1,<0.11
+geopandas>=0.6.2,<0.7
+descartes>=1.1.0,<1.2
+pyarrow