Merge pull request #625 from jbouffard/bug-fix/jars-constant

Renamed GEOTRELLIS_JAR Back to JAR
locationtech-labs · Jan 25, 2018 · ee3a9d9 · ee3a9d9
2 parents 5396a1d + 7e4e6fe
commit ee3a9d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/geopyspark/__init__.py b/geopyspark/__init__.py
@@ -4,7 +4,7 @@
 from geopyspark.geopyspark_utils import ensure_pyspark
 ensure_pyspark()
 
-from geopyspark.geopyspark_constants import GEOTRELLIS_JAR
+from geopyspark.geopyspark_constants import JAR
 from pyspark import RDD, SparkConf, SparkContext
 from pyspark.serializers import AutoBatchedSerializer
 from py4j.java_gateway import JavaClass, JavaObject
@@ -99,7 +99,7 @@ def geopyspark_conf(master=None, appName=None, additional_jar_dirs=[]):
                 possible_jars.append(os.path.relpath(config_file.read(), cwd))
 
     module_jars = [
-        os.path.abspath(resource_filename('geopyspark.jars', GEOTRELLIS_JAR))
+        os.path.abspath(resource_filename('geopyspark.jars', JAR))
     ]
 
     jar_dirs = [(jar, os.path.dirname(jar)) for jar in module_jars]

diff --git a/geopyspark/geopyspark_constants.py b/geopyspark/geopyspark_constants.py
@@ -5,7 +5,7 @@
 VERSION = '0.3.0'
 
 """Backend jar name."""
-GEOTRELLIS_JAR = 'geotrellis-backend-assembly-' + VERSION + '.jar'
+JAR = 'geotrellis-backend-assembly-' + VERSION + '.jar'
 
 """The current location of this file."""
 CWD = path.abspath(path.dirname(__file__))