You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dm...@apache.org on 2020/01/21 11:51:32 UTC
[incubator-dlab] branch develop updated (a78a4aa -> a074857)
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from a78a4aa [DLAB-1459]: Prevented stop action if notebook is in reconfiguring status
add e87a8a0 [DLAB-1409] - [AWS] actual R version in Jupyter UI for DES/Jupyter fixed
new a074857 Merge pull request #537 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:
.../scripts/aws/dataengine-service_jars_parser.py | 14 +++++++++++++-
.../jupyter_dataengine-service_create_configs.py | 14 ++++++--------
.../jupyter_install_dataengine-service_kernels.py | 21 +++++++++++++++------
3 files changed, 34 insertions(+), 15 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 #537 from
apache/DLAB-1409
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a074857253e13b53c7a62e322ba153e7725896da
Merge: a78a4aa e87a8a0
Author: Demyan Mysakovets <34...@users.noreply.github.com>
AuthorDate: Tue Jan 21 13:51:25 2020 +0200
Merge pull request #537 from apache/DLAB-1409
[DLAB-1409] - [AWS] actual R version in Jupyter UI for DES/Jupyter fixed
.../scripts/aws/dataengine-service_jars_parser.py | 14 +++++++++++++-
.../jupyter_dataengine-service_create_configs.py | 14 ++++++--------
.../jupyter_install_dataengine-service_kernels.py | 21 +++++++++++++++------
3 files changed, 34 insertions(+), 15 deletions(-)
diff --cc infrastructure-provisioning/src/general/scripts/aws/dataengine-service_jars_parser.py
index 1487e6e,0db0830..0626285
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_jars_parser.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_jars_parser.py
@@@ -58,13 -58,19 +58,17 @@@ if __name__ == "__main__"
shell=True).decode('UTF-8')
with open('/tmp/scala_version', 'w') as outfile:
outfile.write(scala_ver)
+ os.system('touch /tmp/r_version')
+ r_ver = subprocess.check_output("R --version | awk '/version / {print $3}'", shell=True).decode('UTF-8')
+ with open('/tmp/r_version', 'w') as outfile:
+ outfile.write(r_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