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 2020/01/17 12:48:45 UTC
[incubator-dlab] branch develop updated (f8c425f -> a4642f6)
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from f8c425f Merge pull request #529 from apache/DLAB-1454
add 46e03c1 [DLAB-1409] - AWS Scala version is not actual on Jupyter UI for DES/Jupyter fixed
add e3299b3 [DLAB-1409] - AWS Scala version is not actual on Jupyter UI for DES/Jupyter fixed
new a4642f6 Merge pull request #531 from apache/DLAB-1409
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../general/scripts/aws/dataengine-service_jars_parser.py | 13 +++++++++++++
.../aws/jupyter_dataengine-service_create_configs.py | 5 +++--
.../aws/jupyter_install_dataengine-service_kernels.py | 7 ++++++-
3 files changed, 22 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #531 from
apache/DLAB-1409
Posted by om...@apache.org.
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
commit a4642f6e0d23a5064af9cc1fd6ee70d976dce79a
Merge: f8c425f e3299b3
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Fri Jan 17 14:48:38 2020 +0200
Merge pull request #531 from apache/DLAB-1409
[DLAB-1409]: AWS Scala version is not actual on Jupyter UI for DES/Jupyter fixed
.../general/scripts/aws/dataengine-service_jars_parser.py | 13 +++++++++++++
.../aws/jupyter_dataengine-service_create_configs.py | 5 +++--
.../aws/jupyter_install_dataengine-service_kernels.py | 7 ++++++-
3 files changed, 22 insertions(+), 3 deletions(-)
diff --cc infrastructure-provisioning/src/general/scripts/aws/dataengine-service_jars_parser.py
index 34755b5,5b46445..1487e6e
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_jars_parser.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_jars_parser.py
@@@ -53,13 -53,20 +53,18 @@@ if __name__ == "__main__"
endpoint = "https://s3.{}.amazonaws.com.cn".format(args.region)
else:
endpoint = "https://s3-{}.amazonaws.com".format(args.region)
+ os.system('touch /tmp/scala_version')
+ scala_ver = subprocess.check_output("spark-submit --version 2>&1 | grep -o -P 'Scala version \K.{0,7}'",
+ shell=True).decode('UTF-8')
+ with open('/tmp/scala_version', 'w') as outfile:
+ outfile.write(scala_ver)
os.system('touch /tmp/python_version')
- python_ver = subprocess.check_output("python3.5 -V 2>/dev/null | awk '{print $2}'", shell=True)
- if python_ver != '':
- with open('/tmp/python_version', 'w') as outfile:
- outfile.write(python_ver)
- else:
- python_ver = subprocess.check_output("python3.4 -V 2>/dev/null | awk '{print $2}'", shell=True)
- with open('/tmp/python_version', 'w') as outfile:
- outfile.write(python_ver)
+ for v in range(4, 7):
+ python_ver_checker = "python3.{} -V 2>/dev/null".format(v) + " | awk '{print $2}'"
+ python_ver = subprocess.check_output(python_ver_checker, shell=True)
+ if python_ver != '':
+ with open('/tmp/python_version', 'w') as outfile:
+ outfile.write(python_ver)
os.system('/bin/tar -zhcvf /tmp/jars.tar.gz '
'--no-recursion '
'--absolute-names '
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org