Skip to content

Commit

Permalink
Merge pull request #532 from jbouffard/bug-fix/additional_jars
Browse files Browse the repository at this point in the history
additional_jar_dirs Now Works and GEOPYSPARK_JARS_PATH Removal
  • Loading branch information
Jacob Bouffard committed Nov 8, 2017
2 parents 4f5c60d + 0068a04 commit c2328cf
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions geopyspark/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def geopyspark_conf(master=None, appName=None, additional_jar_dirs=[]):
console
additional_jar_dirs (list, optional): A list of directory locations that
might contain JAR files needed by the current script. Already
includes $(cwd)/jars.
includes $(pwd)/jars.
Returns:
SparkConf
Expand All @@ -82,11 +82,6 @@ def geopyspark_conf(master=None, appName=None, additional_jar_dirs=[]):
current_location = os.path.dirname(os.path.realpath(__file__))
cwd = os.getcwd()

if 'GEOPYSPARK_JARS_PATH' in os.environ:
additional_jar_dirs = os.environ['GEOPYSPARK_JARS_PATH'].split(':')
else:
additional_jar_dirs = []

local_prefixes = [
os.path.abspath(os.path.join(current_location, 'jars')),
os.path.abspath(os.path.join(cwd, 'jars')),
Expand Down

0 comments on commit c2328cf

Please sign in to comment.