Merge pull request #488 from jbouffard/pre-0.2.2/versions

Updated Versions for 0.2.2
locationtech-labs · Aug 25, 2017 · 2485a14 · 2485a14
2 parents ff4d303 + c3caf8f
commit 2485a14
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,7 @@ addons:
 install:
   - pushd geopyspark-backend &&
     ./sbt "project geotrellis-backend" assembly &&
-    cp geotrellis/target/scala-2.11/geotrellis-backend-assembly-0.2.0.jar ../geopyspark/jars &&
+    cp geotrellis/target/scala-2.11/geotrellis-backend-assembly-0.2.2.jar ../geopyspark/jars &&
     popd
   - if [ ! -f archives/spark-2.1.1-bin-hadoop2.7.tgz ]; then
     pushd archives;

diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ export ASSEMBLED="assembled"
 rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
 
 JAR-PATH := geopyspark/jars
-ASSEMBLYNAME := geotrellis-backend-assembly-0.2.0.jar
+ASSEMBLYNAME := geotrellis-backend-assembly-0.2.2.jar
 BUILD-ASSEMBLY := geopyspark-backend/geotrellis/target/scala-2.11/${ASSEMBLYNAME}
 DIST-ASSEMBLY := ${JAR-PATH}/${ASSEMBLYNAME}
 WHEELNAME := geopyspark-0.1.0-py3-none-any.whl

diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -107,3 +107,15 @@ functions as well as a few other minor changes/additions.
     reading from S3.
   - Setting ``max_tile_size`` and ``num_partitions`` in ``geotiff.get`` will now
     work when trying to read geotiffs from S3.
+
+
+0.2.2
+------
+
+0.2.2 fixes the naming issue brought about in 0.2.1 where the backend jar and
+the docs had the incorrect version number.
+
+
+**geopyspark**
+
+  - Fixed version numbers for docs and jar.
diff --git a/docs/conf.py b/docs/conf.py
@@ -29,10 +29,10 @@
     os.environ['SPARK_HOME'] = './spark-2.1.1-bin-hadoop2.7/'
 
 os.chdir('..')
-jar = 'geotrellis-backend-assembly-0.2.0.jar'
+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.2.1/'
+    url = 'https://github.com/locationtech-labs/geopyspark/releases/download/v0.2.2/'
     subprocess.call(['curl', '-L', url+jar, '-o', path.join('geopyspark/jars', jar)])
 
 sys.path.insert(0, path.abspath(os.curdir))
@@ -73,9 +73,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.0'
+version = '0.2.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.0'
+release = '0.2.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/geopyspark-backend/project/Version.scala b/geopyspark-backend/project/Version.scala
@@ -1,5 +1,5 @@
 object Version {
-  val geopyspark = "0.2.0"
+  val geopyspark = "0.2.2"
   val geotrellis = "1.2.0-SNAPSHOT"
   val scala       = "2.11.11"
   val crossScala  = Seq("2.11.11", "2.10.6")

diff --git a/geopyspark/command/configuration.py b/geopyspark/command/configuration.py
@@ -10,7 +10,7 @@
 from geopyspark.geopyspark_constants import JAR, CWD
 
 
-JAR_URL = 'https://github.com/locationtech-labs/geopyspark/releases/download/v0.2.1/' + JAR
+JAR_URL = 'https://github.com/locationtech-labs/geopyspark/releases/download/v0.2.2/' + JAR
 DEFAULT_JAR_PATH = path.join(CWD, 'jars')
 CONF = path.join(CWD, 'command', 'geopyspark.conf')
 

diff --git a/geopyspark/geopyspark_constants.py b/geopyspark/geopyspark_constants.py
@@ -2,7 +2,7 @@
 from os import path
 
 """GeoPySpark version."""
-VERSION = '0.2.0'
+VERSION = '0.2.2'
 
 """Backend jar name."""
 JAR = 'geotrellis-backend-assembly-' + VERSION + '.jar'

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setup_args = dict(
     name='geopyspark',
-    version='0.2.1',
+    version='0.2.2',
     author='Jacob Bouffard, James McClain',
     author_email='jbouffard@azavea.com, jmcclain@azavea.com',
     download_url='http://github.com/locationtech-labs/geopyspark',