Skip to content

Commit 12dfb5a

Browse files
jbouffardjbouffard
authored
Merge pull request #664 from locationtech-labs/feature/gt-2.0
GeoTrellis 2.0 and tag for 0.4.2
2 parents b366868 + f0dcbae commit 12dfb5a

File tree

14 files changed

+54
-27
lines changed

14 files changed

+54
-27
lines changed

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,6 @@ prof/
111111
.#*
112112

113113
# Visual Studio Code
114-
.vscode
114+
.vscode
115+
116+
.pytest_cache

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ script:
6565

6666
before_deploy:
6767
- export GEOPYSPARK_VERSION_SUFFIX="-${TRAVIS_COMMIT:0:7}"
68-
- aws s3 rm s3://geopyspark-dependency-jars/geotrellis-backend-assembly-0.4.1.jar
68+
- aws s3 rm s3://geopyspark-dependency-jars/geotrellis-backend-assembly-0.4.2.jar
6969

7070
deploy:
7171
- provider: script

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst
66

77
JAR-PATH := geopyspark/jars
88

9-
ASSEMBLYNAME := geotrellis-backend-assembly-0.4.1.jar
9+
ASSEMBLYNAME := geotrellis-backend-assembly-0.4.2.jar
1010
BUILD-ASSEMBLY := geopyspark-backend/geotrellis/target/scala-2.11/${ASSEMBLYNAME}
1111
DIST-ASSEMBLY := ${JAR-PATH}/${ASSEMBLYNAME}
1212

13-
WHEELNAME := geopyspark-0.4.1-py3-none-any.whl
13+
WHEELNAME := geopyspark-0.4.2-py3-none-any.whl
1414
WHEEL := dist/${WHEELNAME}
1515

1616
SCALA_SRC := $(call rwildcard, geopyspark-backend/geotrellis/src/, *.scala)

‎docs/CHANGELOG.rst

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,31 @@
11
Changelog
22
==========
33

4+
0.4.2
5+
------
6+
7+
Experimental New Features
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
Creating a RasterLayer From URIs Using rasterio
11+
************************************************
12+
13+
While the ability to create a ``RasterLayer``
14+
from ``URI``\s already exists with the ``geopyspark.geotrellis.geotiff.get``
15+
function, it is limited to just working with GeoTiffs. However, with the
16+
new ``geopyspark.geotrellis.rasterio`` module, it is now possible to
17+
create ``RasterLayer``\s from different file types.
18+
19+
.. code:: python3
20+
21+
uris = ["file://images/image_1.jp2", "file://images/image_2.jp2"]
22+
23+
raster_layer = gps.rasterio.get(uris)
24+
25+
26+
**Note:** This feature is experimental, and will most likely be improved
27+
and/or changed in the future releases of GeoPySpark.
28+
429

530
0.4.1
631
------

‎docs/conf.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
os.environ['SPARK_HOME'] = './spark-2.1.1-bin-hadoop2.7/'
3030

3131
os.chdir('..')
32-
jar = 'geotrellis-backend-assembly-0.2.2.jar'
32+
jar = 'geotrellis-backend-assembly-0.4.2.jar'
3333

3434
if not path.isfile(path.join('geopyspark/jars', jar)):
35-
url = 'https://github.com/locationtech-labs/geopyspark/releases/download/v0.4.1/'
35+
url = 'https://github.com/locationtech-labs/geopyspark/releases/download/v0.4.2/'
3636
subprocess.call(['curl', '-L', url+jar, '-o', path.join('geopyspark/jars', jar)])
3737

3838
sys.path.insert(0, path.abspath(os.curdir))
@@ -73,9 +73,9 @@
7373
# built documents.
7474
#
7575
# The short X.Y version.
76-
version = '0.4.1'
76+
version = '0.4.2'
7777
# The full version, including alpha/beta/rc tags.
78-
release = '0.4.1'
78+
release = '0.4.2'
7979

8080
# The language for content autogenerated by Sphinx. Refer to documentation
8181
# for a list of supported languages.

‎geopyspark-backend/build.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
lazy val commonSettings = Seq(
23
version := Version.geopyspark + scala.util.Properties.envOrElse("GEOPYSPARK_VERSION_SUFFIX", ""),
34
scalaVersion := Version.scala,
@@ -24,7 +25,8 @@ lazy val commonSettings = Seq(
2425
"LocationTech Snapshots" at "https://repo.locationtech.org/content/groups/snapshots",
2526
"LocationTech Releases" at "https://repo.locationtech.org/content/groups/releases",
2627
Resolver.bintrayRepo("azavea", "maven"),
27-
DefaultMavenRepository
28+
DefaultMavenRepository,
29+
Resolver.file("local", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
2830
),
2931

3032
addCompilerPlugin("org.spire-math" % "kind-projector" % "0.9.3" cross CrossVersion.binary),

‎geopyspark-backend/geotools/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name := "geotools-backend"
22

33
libraryDependencies ++= Seq(
4-
"org.apache.spark" %% "spark-core" % "2.2.0" % "provided",
4+
"org.apache.spark" %% "spark-core" % "2.3.0" % "provided",
55
"org.locationtech.geotrellis" %% "geotrellis-s3" % Version.geotrellis,
66
"org.locationtech.geotrellis" %% "geotrellis-s3-testkit" % Version.geotrellis,
77
"org.locationtech.geotrellis" %% "geotrellis-spark" % Version.geotrellis,

‎geopyspark-backend/geotrellis/build.sbt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ libraryDependencies ++= Seq(
44
"org.typelevel" %% "cats" % "0.9.0",
55
"com.typesafe.akka" %% "akka-http" % "10.0.10",
66
"com.typesafe.akka" %% "akka-http-spray-json" % "10.0.10",
7-
"net.sf.py4j" % "py4j" % "0.10.5",
8-
"org.apache.spark" %% "spark-core" % "2.2.0" % "provided",
7+
"net.sf.py4j" % "py4j" % "0.10.6",
8+
"org.apache.spark" %% "spark-core" % "2.3.0" % "provided",
99
"org.apache.commons" % "commons-math3" % "3.6.1",
1010
"org.locationtech.geotrellis" %% "geotrellis-s3" % Version.geotrellis,
1111
"org.locationtech.geotrellis" %% "geotrellis-s3-testkit" % Version.geotrellis,
@@ -24,13 +24,12 @@ assemblyShadeRules in assembly := {
2424
}
2525

2626
assemblyMergeStrategy in assembly := {
27-
case "reference.conf" => MergeStrategy.concat
28-
case "application.conf" => MergeStrategy.concat
29-
case "META-INF/MANIFEST.MF" => MergeStrategy.discard
30-
case "META-INF\\MANIFEST.MF" => MergeStrategy.discard
31-
case "META-INF/ECLIPSEF.RSA" => MergeStrategy.discard
32-
case "META-INF/ECLIPSEF.SF" => MergeStrategy.discard
33-
case x if x.startsWith("META-INF/services") => MergeStrategy.concat
27+
case s if s.startsWith("META-INF/services") => MergeStrategy.concat
28+
case "reference.conf" | "application.conf" => MergeStrategy.concat
29+
case "META-INF/ECLIPSE.RSA" | "META-INF/ECLIPSE.SF" => MergeStrategy.discard
30+
case "META-INF/ECLIPSEF.RSA" | "META-INF/ECLIPSEF.SF" => MergeStrategy.discard
31+
case "META-INF/ECLIPSE_.RSA" | "META-INF/ECLIPSE_.SF" => MergeStrategy.discard
32+
case "META-INF/MANIFEST.MF" | "META-INF\\MANIFEST.MF" => MergeStrategy.discard
3433
case _ => MergeStrategy.first
3534
}
3635

‎geopyspark-backend/project/Version.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object Version {
2-
val geopyspark = "0.4.1"
3-
val geotrellis = "2.0.0-SNAPSHOT"
2+
val geopyspark = "0.4.2"
3+
val geotrellis = "2.0.0-RC1"
44
val scala = "2.11.11"
55
val scalaTest = "2.2.0"
66
}

‎geopyspark-backend/vectorpipe/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name := "vectorpipe"
22

33
libraryDependencies ++= Seq(
4-
"org.apache.spark" %% "spark-hive" % "2.2.0" % "provided",
4+
"org.apache.spark" %% "spark-hive" % "2.3.0" % "provided",
55
"org.locationtech.geotrellis" %% "geotrellis-s3" % Version.geotrellis,
66
"org.locationtech.geotrellis" %% "geotrellis-s3-testkit" % Version.geotrellis,
77
"org.locationtech.geotrellis" %% "geotrellis-spark" % Version.geotrellis,

‎geopyspark/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,8 @@ def geopyspark_conf(master=None, appName=None, additional_jar_dirs=[]):
114114
if not jars:
115115
raise IOError("Failed to find any jars. Looked at these paths {}".format(possible_jars))
116116

117-
jar_string = ",".join(jars)
117+
jar_string = ",".join(set(jars))
118118
conf.set(key='spark.jars', value=jar_string)
119-
120119
conf.set(key='spark.driver.memory', value='8G')
121120
conf.set(key='spark.executor.memory', value='8G')
122121

‎geopyspark/command/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from geopyspark.geopyspark_constants import JAR, CWD
1111

1212

13-
JAR_URL = 'https://github.com/locationtech-labs/geopyspark/releases/download/v0.4.1/' + JAR
13+
JAR_URL = 'https://github.com/locationtech-labs/geopyspark/releases/download/v0.4.2/' + JAR
1414
DEFAULT_JAR_PATH = path.join(CWD, 'jars')
1515
CONF = path.join(CWD, 'command', 'geopyspark.conf')
1616

‎geopyspark/geopyspark_constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from os import path
33

44
"""GeoPySpark version."""
5-
VERSION = '0.4.1'
5+
VERSION = '0.4.2'
66

77
"""Backend jar name."""
88
JAR = 'geotrellis-backend-assembly-' + VERSION + '.jar'

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
setup_args = dict(
99
name='geopyspark',
10-
version='0.4.1',
10+
version='0.4.2',
1111
author='Jacob Bouffard, James McClain',
1212
author_email='[email protected], [email protected]',
1313
download_url='http://github.com/locationtech-labs/geopyspark',

0 commit comments

Comments
 (0)