Skip to content

Commit 6f5faaa

Browse files
committed
Merge branch 'master' into develop
2 parents 8bcac6f + 14c8dc5 commit 6f5faaa

File tree

6 files changed

+6
-20
lines changed

6 files changed

+6
-20
lines changed

docs/src/main/paradox/release-notes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
### 0.8.2
66

7+
* Added ability to pass config options to convenience PySpark session constructor. ([#361](https://github.com/locationtech/rasterframes/issues/361))
8+
* Bumped Spark dependency to version 2.3.4. ([#350](https://github.com/locationtech/rasterframes/issues/350))
79
* Fixed handling of aggregate extent and image size on GeoTIFF writing. ([#362](https://github.com/locationtech/rasterframes/issues/362))
810
* Fixed issue with `RasterSourceDataSource` swallowing exceptions. ([#267](https://github.com/locationtech/rasterframes/issues/267))
911
* Fixed SparkML memory pressure issue caused by unnecessary reevaluation, overallocation, and primitive boxing. ([#343](https://github.com/locationtech/rasterframes/issues/343))

project/RFDependenciesPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ object RFDependenciesPlugin extends AutoPlugin {
5959
),
6060

6161
// NB: Make sure to update the Spark version in pyrasterframes/python/setup.py
62-
rfSparkVersion := "2.3.3",
62+
rfSparkVersion := "2.3.4",
6363
rfGeoTrellisVersion := "2.3.1",
6464
rfGeoMesaVersion := "2.2.1",
6565
//dependencyOverrides += "com.azavea.gdal" % "gdal-warp-bindings" % "33.58d4965"

pyrasterframes/src/main/python/docs/__init__.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,9 @@
1818
# SPDX-License-Identifier: Apache-2.0
1919
#
2020

21-
import os
22-
2321
from pweave import PwebPandocFormatter
2422

2523

26-
def docs_dir():
27-
return os.path.dirname(os.path.realpath(__file__))
28-
29-
30-
# This is temporary until we port to run on web assets.
31-
def resource_dir():
32-
# we may consider using gitpython which I think would be appropriate in the context of building docs
33-
# see https://stackoverflow.com/a/41920796/2787937
34-
here = docs_dir()
35-
test_resource = os.path.realpath(os.path.join(here, '..', '..', '..', 'src', 'test', 'resources'))
36-
37-
return test_resource
38-
39-
4024
class PegdownMarkdownFormatter(PwebPandocFormatter):
4125
def __init__(self, *args, **kwargs):
4226
super().__init__(*args, **kwargs)

pyrasterframes/src/main/python/pyrasterframes/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
#
2121

2222
# Translating Java version from version.sbt to PEP440 norms
23-
__version__ = '0.8.2.dev0'
23+
__version__ = '0.8.2'

pyrasterframes/src/main/python/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pytz
22
Shapely>=1.6.0
3-
pyspark==2.3.3 # See issue # 154
3+
pyspark==2.3.4 # See issue # 154
44
numpy>=1.7
55
pandas>=0.25.0
66
matplotlib<3.0.0 # no python 2.7 support after v2.x.x

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version in ThisBuild := "0.8.2-SNAPSHOT"
1+
version in ThisBuild := "0.8.2"

0 commit comments

Comments
 (0)