diff --git a/docs/src/main/paradox/release-notes.md b/docs/src/main/paradox/release-notes.md index 0184279ed..546168efb 100644 --- a/docs/src/main/paradox/release-notes.md +++ b/docs/src/main/paradox/release-notes.md @@ -4,6 +4,8 @@ ### 0.8.2 +* Added ability to pass config options to convenience PySpark session constructor. ([#361](https://github.com/locationtech/rasterframes/issues/361)) +* Bumped Spark dependency to version 2.3.4. ([#350](https://github.com/locationtech/rasterframes/issues/350)) * Fixed handling of aggregate extent and image size on GeoTIFF writing. ([#362](https://github.com/locationtech/rasterframes/issues/362)) * Fixed issue with `RasterSourceDataSource` swallowing exceptions. ([#267](https://github.com/locationtech/rasterframes/issues/267)) * Fixed SparkML memory pressure issue caused by unnecessary reevaluation, overallocation, and primitive boxing. ([#343](https://github.com/locationtech/rasterframes/issues/343)) diff --git a/project/RFDependenciesPlugin.scala b/project/RFDependenciesPlugin.scala index 85fa87923..f8e21c243 100644 --- a/project/RFDependenciesPlugin.scala +++ b/project/RFDependenciesPlugin.scala @@ -59,7 +59,7 @@ object RFDependenciesPlugin extends AutoPlugin { ), // NB: Make sure to update the Spark version in pyrasterframes/python/setup.py - rfSparkVersion := "2.3.3", + rfSparkVersion := "2.3.4", rfGeoTrellisVersion := "2.3.1", rfGeoMesaVersion := "2.2.1", //dependencyOverrides += "com.azavea.gdal" % "gdal-warp-bindings" % "33.58d4965" diff --git a/pyrasterframes/src/main/python/docs/__init__.py b/pyrasterframes/src/main/python/docs/__init__.py index 1778c5590..0f728b435 100644 --- a/pyrasterframes/src/main/python/docs/__init__.py +++ b/pyrasterframes/src/main/python/docs/__init__.py @@ -18,25 +18,9 @@ # SPDX-License-Identifier: Apache-2.0 # -import os - from pweave import PwebPandocFormatter -def docs_dir(): - return os.path.dirname(os.path.realpath(__file__)) - - -# This is temporary until we port to run on web assets. -def resource_dir(): - # we may consider using gitpython which I think would be appropriate in the context of building docs - # see https://stackoverflow.com/a/41920796/2787937 - here = docs_dir() - test_resource = os.path.realpath(os.path.join(here, '..', '..', '..', 'src', 'test', 'resources')) - - return test_resource - - class PegdownMarkdownFormatter(PwebPandocFormatter): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff --git a/pyrasterframes/src/main/python/pyrasterframes/version.py b/pyrasterframes/src/main/python/pyrasterframes/version.py index 55b8dfe06..5f2706e94 100644 --- a/pyrasterframes/src/main/python/pyrasterframes/version.py +++ b/pyrasterframes/src/main/python/pyrasterframes/version.py @@ -20,4 +20,4 @@ # # Translating Java version from version.sbt to PEP440 norms -__version__ = '0.8.2.dev0' +__version__ = '0.8.2' diff --git a/pyrasterframes/src/main/python/requirements.txt b/pyrasterframes/src/main/python/requirements.txt index 945404eaf..20156c3c5 100644 --- a/pyrasterframes/src/main/python/requirements.txt +++ b/pyrasterframes/src/main/python/requirements.txt @@ -1,6 +1,6 @@ pytz Shapely>=1.6.0 -pyspark==2.3.3 # See issue # 154 +pyspark==2.3.4 # See issue # 154 numpy>=1.7 pandas>=0.25.0 matplotlib<3.0.0 # no python 2.7 support after v2.x.x diff --git a/version.sbt b/version.sbt index 05d6fc967..3f0ac0890 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.8.2-SNAPSHOT" +version in ThisBuild := "0.8.2"