Config and dep changes for python and docs build

Signed-off-by: Jason T. Brown <[email protected]>

Author: vpipkt

.circleci/config.yml

@@ -136,7 +136,6 @@ jobs:
       - run:
           name: "Create PyRasterFrames package"
           command: |-
-            python -m pip install --user pyspark==2.4.5
             sbt -v -batch pyrasterframes/package
 
       - run:

project/RFDependenciesPlugin.scala

@@ -73,7 +73,7 @@ object RFDependenciesPlugin extends AutoPlugin {
     },
     // dependencyOverrides += "com.azavea.gdal" % "gdal-warp-bindings" % "33.f746890",
     // NB: Make sure to update the Spark version in pyrasterframes/python/setup.py
-    rfSparkVersion := "2.4.5",
+    rfSparkVersion := "2.4.7",
     rfGeoTrellisVersion := "3.3.0",
     rfGeoMesaVersion := "2.2.1"
   )

pyrasterframes/src/main/python/docs/zonal-algebra.md

@@ -1,5 +1,5 @@
 ipython==6.2.1
-pyspark==2.4.5
+pyspark==2.4.7
 gdal==2.4.4
 numpy>=1.17.3,<2.0
 pandas>=0.25.3,<1.0

pyrasterframes/src/main/python/requirements.txt

@@ -144,11 +144,13 @@ def dest_file(self, src_file):
 ipython = 'ipython==6.2.1'
 jupyter_client = 'jupyter-client<6.0'  # v6 breaks pweave
 matplotlib = 'matplotlib'
+nbclient = 'nbclient==0.1.0'  # compatible with our pweave => jupyter_client restrictions
+nbconvert = 'nbconvert==5.5.0'
 numpy = 'numpy>=1.17.3,<2.0'
 pandas = 'pandas>=0.25.3,<1.0'
 pweave = 'pweave==0.30.3'
 pypandoc = 'pypandoc'
-pyspark = 'pyspark==2.4.5'
+pyspark = 'pyspark==2.4.7'
 pytest = 'pytest>=4.0.0,<5.0.0'
 pytest_runner = 'pytest-runner'
 pytz = 'pytz'
@@ -196,9 +198,11 @@ def dest_file(self, src_file):
         pytest_runner,
         setuptools,
         ipython,
-        ipykernel,
+        # ipykernel,
         pweave,
         jupyter_client,
+        nbclient,
+        nbconvert,
         fiona,
         rasterio,
         folium,