You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/03/28 15:57:05 UTC
[incubator-dlab] branch develop updated: [DLAB-531]: Fix broken
python on jupyter/zeppelin after DataProc install
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 623fd3c [DLAB-531]: Fix broken python on jupyter/zeppelin after DataProc install
new 759651d Merge pull request #67 from ioleksandr/DLAB-531
623fd3c is described below
commit 623fd3c61db076ba8402b1294c4b8f1b1cbb65be
Author: Oleksandr_Isniuk <i....@gmail.com>
AuthorDate: Thu Mar 28 17:41:30 2019 +0200
[DLAB-531]: Fix broken python on jupyter/zeppelin after DataProc install
---
infrastructure-provisioning/src/general/lib/aws/actions_lib.py | 7 +++----
infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 6 +++---
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
index 51d4567..f6f37d0 100644
--- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
@@ -1510,9 +1510,8 @@ def installing_python(region, bucket, user_name, cluster_name, application='', p
local(venv_command + ' && sudo -i ' + pip_command +
' install https://cntk.ai/PythonWheel/GPU/cntk-2.0rc3-cp{0}-cp{0}m-linux_x86_64.whl '
'--no-cache-dir'.format(python_without_dots[:2]))
- local('sudo rm -rf /usr/bin/python' + python_version[0:3])
- local('sudo ln -fs /opt/python/python' + python_version + '/bin/python' + python_version[0:3] +
- ' /usr/bin/python' + python_version[0:3])
+ local('sudo rm -rf /usr/bin/python{}-dp'.format(python_version[0:3]))
+ local('sudo ln -fs /opt/python/python{0}/bin/python{1} /usr/bin/python{1}-dp'.format(python_version, python_version[0:3]))
def spark_defaults(args):
@@ -1705,7 +1704,7 @@ def configure_zeppelin_emr_interpreter(emr_version, cluster_name, region, spark_
local('sudo systemctl start livy-server-{}'.format(str(livy_port)))
else:
template_file = "/tmp/dataengine-service_interpreter.json"
- p_versions = ["2", python_version[:3]]
+ p_versions = ["2", "{}-dp".format(python_version[:3])]
for p_version in p_versions:
fr = open(template_file, 'r+')
text = fr.read()
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index d1bb3af..8be32e9 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -1129,7 +1129,7 @@ class GCPActions:
local('sudo systemctl start livy-server-{}'.format(str(livy_port)))
else:
template_file = "/tmp/dataengine-service_interpreter.json"
- p_versions = ["2", python_version[:3]]
+ p_versions = ["2", "{}-dp".format(python_version[:3])]
for p_version in p_versions:
fr = open(template_file, 'r+')
text = fr.read()
@@ -1180,8 +1180,8 @@ class GCPActions:
python_without_dots = python_version.replace('.', '')
local('{0} && sudo -i {1} install https://cntk.ai/PythonWheel/GPU/cntk-2.0rc3-cp{2}-cp{2}m-linux_x86_64.whl --no-cache-dir'
.format(venv_command, pip_command, python_without_dots[:2]))
- local('sudo rm -rf /usr/bin/python{}'.format(python_version[0:3]))
- local('sudo ln -fs /opt/python/python{0}/bin/python{1} /usr/bin/python{1}'.format(python_version, python_version[0:3]))
+ local('sudo rm -rf /usr/bin/python{}-dp'.format(python_version[0:3]))
+ local('sudo ln -fs /opt/python/python{0}/bin/python{1} /usr/bin/python{1}-dp'.format(python_version, python_version[0:3]))
except Exception as err:
logging.info(
"Unable to install python: " + str(err) + "\n Traceback: " + traceback.print_exc(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org