Skip to content

Commit

Permalink
Merge pull request #660 from jbouffard/0.4.1-release
Browse files Browse the repository at this point in the history
0.4.1 Release
  • Loading branch information
Jacob Bouffard committed May 24, 2018
2 parents bc63e03 + 85c22b7 commit d03d95f
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 10 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.0.jar
- aws s3 rm s3://geopyspark-dependency-jars/geotrellis-backend-assembly-0.4.1.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.0.jar
ASSEMBLYNAME := geotrellis-backend-assembly-0.4.1.jar
BUILD-ASSEMBLY := geopyspark-backend/geotrellis/target/scala-2.11/${ASSEMBLYNAME}
DIST-ASSEMBLY := ${JAR-PATH}/${ASSEMBLYNAME}

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

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


0.4.1
------

Bug Fixes
^^^^^^^^^

There was a bug in the Scala backend in 0.4.0 that caused certain layers
on S3 to not be read. This has since been resolved and 0.4.1 will have this
fixed Scala backend. No other notable changes/fixes have been done between
0.4.0 and 0.4.1.


0.4.0
------

Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
jar = 'geotrellis-backend-assembly-0.2.2.jar'

if not path.isfile(path.join('geopyspark/jars', jar)):
url = 'https://github.com/locationtech-labs/geopyspark/releases/download/v0.4.0/'
url = 'https://github.com/locationtech-labs/geopyspark/releases/download/v0.4.1/'
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.0'
version = '0.4.1'
# The full version, including alpha/beta/rc tags.
release = '0.4.0'
release = '0.4.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion geopyspark-backend/project/Version.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object Version {
val geopyspark = "0.4.0"
val geopyspark = "0.4.1"
val geotrellis = "2.0.0-SNAPSHOT"
val scala = "2.11.11"
val scalaTest = "2.2.0"
Expand Down
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.0/' + JAR
JAR_URL = 'https://github.com/locationtech-labs/geopyspark/releases/download/v0.4.1/' + 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.0'
VERSION = '0.4.1'

"""Backend jar name."""
JAR = 'geotrellis-backend-assembly-' + VERSION + '.jar'
Expand Down
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.0',
version='0.4.1',
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 d03d95f

Please sign in to comment.