From a35a2cf3e7b807a1a96654c42e18e5fc79b06e35 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 15 Apr 2019 13:35:19 -0700 Subject: [PATCH 1/4] update python3 executable to 3.6.x --- dev/run-tests.py | 2 +- python/run-tests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/run-tests.py b/dev/run-tests.py index 65e6f29c5db5b..64254f39ddb0e 100755 --- a/dev/run-tests.py +++ b/dev/run-tests.py @@ -521,7 +521,7 @@ def main(): hadoop_version = os.environ.get("AMPLAB_JENKINS_BUILD_PROFILE", "hadoop2.6") 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") + 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 ccbdfac3f3850..921fdc9a0c91c 100755 --- a/python/run-tests.py +++ b/python/run-tests.py @@ -162,7 +162,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 6a3b3c6f1c1a29ea3e3cc2bcb483dd59655e291b Mon Sep 17 00:00:00 2001 From: shane knapp Date: Wed, 17 Apr 2019 10:44:54 -0700 Subject: [PATCH 2/4] updated path for testing --- 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 64254f39ddb0e..fa157c774de73 100755 --- a/dev/run-tests.py +++ b/dev/run-tests.py @@ -521,7 +521,8 @@ def main(): hadoop_version = os.environ.get("AMPLAB_JENKINS_BUILD_PROFILE", "hadoop2.6") test_env = "amplab_jenkins" # add path for Python3 in Jenkins if we're calling from a Jenkins machine - os.environ["PATH"] = "/home/anaconda/envs/py36/bin:" + os.environ.get("PATH") + # TODO(sknapp): s/-new// before merging + os.environ["PATH"] = "/home/anaconda/envs/py36-new/bin:" + os.environ.get("PATH") else: # else we're running locally and can use local settings build_tool = "sbt" From d17e8fc0228ed4163349273f175f92d28e44edcf Mon Sep 17 00:00:00 2001 From: shane knapp Date: Wed, 17 Apr 2019 10:46:33 -0700 Subject: [PATCH 3/4] s/36/3k --- dev/run-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/run-tests.py b/dev/run-tests.py index fa157c774de73..acaa544583ddc 100755 --- a/dev/run-tests.py +++ b/dev/run-tests.py @@ -522,7 +522,7 @@ def main(): test_env = "amplab_jenkins" # add path for Python3 in Jenkins if we're calling from a Jenkins machine # TODO(sknapp): s/-new// before merging - os.environ["PATH"] = "/home/anaconda/envs/py36-new/bin:" + os.environ.get("PATH") + os.environ["PATH"] = "/home/anaconda/envs/py3k-new/bin:" + os.environ.get("PATH") else: # else we're running locally and can use local settings build_tool = "sbt" From a7bd7bf93d8a84962dda7a23c21ef575348ddc6d Mon Sep 17 00:00:00 2001 From: shane knapp Date: Fri, 19 Apr 2019 09:29:56 -0700 Subject: [PATCH 4/4] remove testing path --- dev/run-tests.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev/run-tests.py b/dev/run-tests.py index acaa544583ddc..65e6f29c5db5b 100755 --- a/dev/run-tests.py +++ b/dev/run-tests.py @@ -521,8 +521,7 @@ def main(): hadoop_version = os.environ.get("AMPLAB_JENKINS_BUILD_PROFILE", "hadoop2.6") test_env = "amplab_jenkins" # add path for Python3 in Jenkins if we're calling from a Jenkins machine - # TODO(sknapp): s/-new// before merging - os.environ["PATH"] = "/home/anaconda/envs/py3k-new/bin:" + os.environ.get("PATH") + os.environ["PATH"] = "/home/anaconda/envs/py3k/bin:" + os.environ.get("PATH") else: # else we're running locally and can use local settings build_tool = "sbt"