Skip to content

Commit

Permalink
GeoPySpark 0.4.3
Browse files Browse the repository at this point in the history
Removed unused dependencies: cats and py4j
  • Loading branch information
echeipesh authored and Jacob Bouffard committed Dec 10, 2018
1 parent 12dfb5a commit 4ad7d6b
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ script:

before_deploy:
- export GEOPYSPARK_VERSION_SUFFIX="-${TRAVIS_COMMIT:0:7}"
- aws s3 rm s3://geopyspark-dependency-jars/geotrellis-backend-assembly-0.4.2.jar
- aws s3 rm s3://geopyspark-dependency-jars/geotrellis-backend-assembly-0.4.3.jar

deploy:
- provider: script
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst

JAR-PATH := geopyspark/jars

ASSEMBLYNAME := geotrellis-backend-assembly-0.4.2.jar
ASSEMBLYNAME := geotrellis-backend-assembly-0.4.3.jar
BUILD-ASSEMBLY := geopyspark-backend/geotrellis/target/scala-2.11/${ASSEMBLYNAME}
DIST-ASSEMBLY := ${JAR-PATH}/${ASSEMBLYNAME}

WHEELNAME := geopyspark-0.4.2-py3-none-any.whl
WHEELNAME := geopyspark-0.4.3-py3-none-any.whl
WHEEL := dist/${WHEELNAME}

SCALA_SRC := $(call rwildcard, geopyspark-backend/geotrellis/src/, *.scala)
Expand Down
6 changes: 6 additions & 0 deletions docs/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog
==========


0.4.3
------

Update to GeoTrellis 2.0.1

0.4.2
------

Expand Down
8 changes: 4 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
os.environ['SPARK_HOME'] = './spark-2.1.1-bin-hadoop2.7/'

os.chdir('..')
jar = 'geotrellis-backend-assembly-0.4.2.jar'
jar = 'geotrellis-backend-assembly-0.4.3.jar'

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

sys.path.insert(0, path.abspath(os.curdir))
Expand Down Expand Up @@ -73,9 +73,9 @@
# built documents.
#
# The short X.Y version.
version = '0.4.2'
version = '0.4.3'
# The full version, including alpha/beta/rc tags.
release = '0.4.2'
release = '0.4.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 0 additions & 2 deletions geopyspark-backend/geotrellis/build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
name := "geotrellis-backend"

libraryDependencies ++= Seq(
"org.typelevel" %% "cats" % "0.9.0",
"com.typesafe.akka" %% "akka-http" % "10.0.10",
"com.typesafe.akka" %% "akka-http-spray-json" % "10.0.10",
"net.sf.py4j" % "py4j" % "0.10.6",
"org.apache.spark" %% "spark-core" % "2.3.0" % "provided",
"org.apache.commons" % "commons-math3" % "3.6.1",
"org.locationtech.geotrellis" %% "geotrellis-s3" % Version.geotrellis,
Expand Down
4 changes: 2 additions & 2 deletions geopyspark-backend/project/Version.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
object Version {
val geopyspark = "0.4.2"
val geotrellis = "2.0.0-RC1"
val geopyspark = "0.4.3"
val geotrellis = "2.0.1"
val scala = "2.11.11"
val scalaTest = "2.2.0"
}
2 changes: 1 addition & 1 deletion geopyspark/command/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from geopyspark.geopyspark_constants import JAR, CWD


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

Expand Down
2 changes: 1 addition & 1 deletion geopyspark/geopyspark_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from os import path

"""GeoPySpark version."""
VERSION = '0.4.2'
VERSION = '0.4.3'

"""Backend jar name."""
JAR = 'geotrellis-backend-assembly-' + VERSION + '.jar'
Expand Down
1 change: 1 addition & 0 deletions project/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sbt.version=1.2.3
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

setup_args = dict(
name='geopyspark',
version='0.4.2',
version='0.4.3',
author='Jacob Bouffard, James McClain',
author_email='jbouffard@azavea.com, jmcclain@azavea.com',
download_url='http://github.com/locationtech-labs/geopyspark',
Expand Down

0 comments on commit 4ad7d6b

Please sign in to comment.