From 1d1480094fd102819c8f2675f2c583d96286ba96 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 1 Apr 2019 15:46:18 -0700 Subject: [PATCH 1/2] update python3 executable to 3.6.x --- dev/run-tests.py | 3 ++- python/run-tests.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/run-tests.py b/dev/run-tests.py index dfad2991077b2..4eaf5b3c10aff 100755 --- a/dev/run-tests.py +++ b/dev/run-tests.py @@ -546,7 +546,8 @@ def main(): hadoop_version = os.environ.get("AMPLAB_JENKINS_BUILD_PROFILE", "hadoop2.7") test_env = "amplab_jenkins" # add path for Python3 in Jenkins if we're calling from a Jenkins machine - os.environ["PATH"] = "/home/anaconda/envs/py3k/bin:" + os.environ.get("PATH") + # TODO(sknapp): s/py36/py3k before merging! + os.environ["PATH"] = "/home/anaconda/envs/py36/bin:" + os.environ.get("PATH") else: # else we're running locally and can use local settings build_tool = "sbt" diff --git a/python/run-tests.py b/python/run-tests.py index 793035f5d83ae..027069da7b814 100755 --- a/python/run-tests.py +++ b/python/run-tests.py @@ -160,7 +160,7 @@ def run_individual_python_test(target_dir, test_name, pyspark_python): def get_default_python_executables(): - python_execs = [x for x in ["python2.7", "python3.4", "pypy"] if which(x)] + python_execs = [x for x in ["python2.7", "python3.6", "pypy"] if which(x)] if "python2.7" not in python_execs: LOGGER.warning("Not testing against `python2.7` because it could not be found; falling" " back to `python` instead") From ba77b412b31609d44c47b7eb3b11cda234fc2ec1 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Wed, 17 Apr 2019 10:16:50 -0700 Subject: [PATCH 2/2] update comment for future shane and new jenkins workers --- dev/run-tests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/run-tests.py b/dev/run-tests.py index 4eaf5b3c10aff..70dcb4a42e41f 100755 --- a/dev/run-tests.py +++ b/dev/run-tests.py @@ -546,7 +546,8 @@ def main(): hadoop_version = os.environ.get("AMPLAB_JENKINS_BUILD_PROFILE", "hadoop2.7") test_env = "amplab_jenkins" # add path for Python3 in Jenkins if we're calling from a Jenkins machine - # TODO(sknapp): s/py36/py3k before merging! + # TODO(sknapp): after all builds are ported to the ubuntu workers, change this to be: + # /home/jenkins/anaconda2/envs/py36/bin os.environ["PATH"] = "/home/anaconda/envs/py36/bin:" + os.environ.get("PATH") else: # else we're running locally and can use local settings