@@ -153,30 +153,6 @@ def determine_java_executable():
153153 return java_exe if java_exe else which ("java" )
154154
155155
156- JavaVersion = namedtuple ('JavaVersion' , ['major' , 'minor' , 'patch' ])
157-
158-
159- def determine_java_version (java_exe ):
160- """Given a valid java executable will return its version in named tuple format
161- with accessors '.major', '.minor', '.patch', '.update'"""
162-
163- raw_output = subprocess .check_output ([java_exe , "-version" ],
164- stderr = subprocess .STDOUT ,
165- universal_newlines = True )
166-
167- raw_output_lines = raw_output .split ('\n ' )
168-
169- # find raw version string, eg 'java version "1.8.0_25"'
170- raw_version_str = next (x for x in raw_output_lines if " version " in x )
171-
172- match = re .search (r'(\d+)\.(\d+)\.(\d+)' , raw_version_str )
173-
174- major = int (match .group (1 ))
175- minor = int (match .group (2 ))
176- patch = int (match .group (3 ))
177-
178- return JavaVersion (major , minor , patch )
179-
180156# -------------------------------------------------------------------------------------------------
181157# Functions for running the other build and test scripts
182158# -------------------------------------------------------------------------------------------------
@@ -494,8 +470,6 @@ def main():
494470 " install one and retry." )
495471 sys .exit (2 )
496472
497- #java_version = determine_java_version(java_exe)
498-
499473 # install SparkR
500474 if which ("R" ):
501475 run_cmd ([os .path .join (SPARK_HOME , "R" , "install-dev.sh" )])
0 commit comments