You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/04/08 07:04:21 UTC
[incubator-datalab] 02/03: [DATALAB-2091]: specified which
functions to import
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit a621158486081ab27aa54ac27a40cde5d097aa3c
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Apr 8 10:02:55 2021 +0300
[DATALAB-2091]: specified which functions to import
---
.../src/general/scripts/aws/common_remove_remote_kernels.py | 6 +++---
.../src/general/scripts/aws/rstudio_configure.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_remove_remote_kernels.py b/infrastructure-provisioning/src/general/scripts/aws/common_remove_remote_kernels.py
index c9a08e2..f903a92 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_remove_remote_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_remove_remote_kernels.py
@@ -23,8 +23,8 @@
import argparse
import sys
-from datalab.actions_lib import *
-from datalab.fab import *
+from datalab.actions_lib import remove_dataengine_kernels, remove_kernels
+from datalab.fab import init_datalab_connection, find_cluster_kernels
from fabric import *
parser = argparse.ArgumentParser()
@@ -39,7 +39,7 @@ args = parser.parse_args()
if __name__ == "__main__":
print('Configure connections')
global conn
- conn = datalab.fab.init_datalab_connection(args.hostname, args.os_user, args.keyfile)
+ conn = init_datalab_connection(args.hostname, args.os_user, args.keyfile)
try:
de_clusters, des_clusters = find_cluster_kernels()
diff --git a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
index 70e5e2c..3ad6aca 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
@@ -223,7 +223,7 @@ if __name__ == "__main__":
try:
logging.info('[POST CONFIGURING PROCESS]')
print('[POST CONFIGURING PROCESS')
- if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None']:
+ if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None', '']:
params = "--hostname {} --keyfile {} --os_user {} --nb_tag_name {} --nb_tag_value {}" \
.format(instance_hostname, keyfile_name, notebook_config['datalab_ssh_user'],
notebook_config['tag_name'], notebook_config['instance_name'])
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org