This is an automated email from the ASF dual-hosted git repository.

mykolabodnar pushed a commit to branch DLAB-515
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-515 by this push:
     new 35eb846  [DLAB-515]: Toree version updated
35eb846 is described below

commit 35eb846514058c119a97113dc5b410402534acb5
Author: bodnarmykola <[email protected]>
AuthorDate: Tue May 26 15:05:52 2020 +0300

    [DLAB-515]: Toree version updated
---
 .../scripts/deploy_repository/deploy_repository.py             | 10 +++++-----
 infrastructure-provisioning/src/general/lib/os/fab.py          |  4 ++--
 .../scripts/aws/jupyter_dataengine-service_create_configs.py   |  4 ++--
 .../scripts/gcp/jupyter_dataengine-service_create_configs.py   |  4 ++--
 .../general/scripts/os/jupyter_dataengine_create_configs.py    |  4 ++--
 .../src/jupyter/scripts/configure_jupyter_node.py              |  2 +-
 .../src/jupyterlab/scripts/configure_jupyterlab_node.py        |  2 +-
 .../src/ssn/scripts/configure_docker.py                        |  8 ++++----
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git 
a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py 
b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
index 3864229..0c761a5 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
+++ b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
@@ -1186,7 +1186,7 @@ def download_packages():
                 
'https://repo1.maven.org/maven2/org/jfree/jfreechart/{0}/jfreechart-{0}.jar'.format('1.0.19'),
                 
'https://repo1.maven.org/maven2/org/jfree/jcommon/{0}/jcommon-{0}.jar'.format('1.0.24'),
                 '--no-check-certificate 
https://brunelvis.org/jar/spark-kernel-brunel-all-{0}.jar'.format('2.3'),
-                
'http://archive.apache.org/dist/incubator/toree/0.2.0-incubating/toree-pip/toree-0.2.0.tar.gz',
+                
'http://archive.apache.org/dist/incubator/toree/0.3.0-incubating/toree-pip/toree-0.3.0.tar.gz',
                 
'https://download2.rstudio.org/server/trusty/amd64/rstudio-server-{}-amd64.deb'.format(
                     configuration['notebook_rstudio_version']),
                 
'http://us.download.nvidia.com/XFree86/Linux-x86_64/{0}/NVIDIA-Linux-x86_64-{0}.run'.format(
@@ -1222,10 +1222,10 @@ def download_packages():
                     configuration['notebook_livy_version']),
                 
'https://dl.bintray.com/spark-packages/maven/tapanalyticstoolkit/spark-tensorflow-connector/'
                 '1.0.0-s_2.11/spark-tensorflow-connector-1.0.0-s_2.11.jar',
-                
'https://archive.apache.org/dist/incubator/toree/0.2.0-incubating/toree/'
-                'toree-0.2.0-incubating-bin.tar.gz',
-                
'https://repo1.maven.org/maven2/org/apache/toree/toree-assembly/0.2.0-incubating/'
-                'toree-assembly-0.2.0-incubating.jar',
+                
'https://archive.apache.org/dist/incubator/toree/0.3.0-incubating/toree/'
+                'toree-0.3.0-incubating-bin.tar.gz',
+                
'https://repo1.maven.org/maven2/org/apache/toree/toree-assembly/0.3.0-incubating/'
+                'toree-assembly-0.3.0-incubating.jar',
                 
'https://cran.r-project.org/src/contrib/Archive/keras/keras_{}.tar.gz'.format(
                     configuration['notebook_keras_version'])
             ]
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py 
b/infrastructure-provisioning/src/general/lib/os/fab.py
index 54cfe1c..a751917 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -498,8 +498,8 @@ def ensure_toree_local_kernel(os_user, toree_link, 
scala_kernel_path, files_dir,
             sudo('ln -s /opt/spark/ /usr/local/spark')
             sudo('jupyter toree install')
             sudo('mv ' + scala_kernel_path + 'lib/* /tmp/')
-            put(files_dir + 'toree-assembly-0.2.0.jar', 
'/tmp/toree-assembly-0.2.0.jar')
-            sudo('mv /tmp/toree-assembly-0.2.0.jar ' + scala_kernel_path + 
'lib/')
+            put(files_dir + 'toree-assembly-0.3.0.jar', 
'/tmp/toree-assembly-0.3.0.jar')
+            sudo('mv /tmp/toree-assembly-0.3.0.jar ' + scala_kernel_path + 
'lib/')
             sudo(
                 'sed -i "s|Apache Toree - Scala|Local Apache Toree - Scala 
(Scala-' + scala_version +
                 ', Spark-' + spark_version + ')|g" ' + scala_kernel_path + 
'kernel.json')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/jupyter_dataengine-service_create_configs.py
 
b/infrastructure-provisioning/src/general/scripts/aws/jupyter_dataengine-service_create_configs.py
index 5f17c07..ed3daee 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/jupyter_dataengine-service_create_configs.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/jupyter_dataengine-service_create_configs.py
@@ -106,8 +106,8 @@ def toree_kernel(args):
     else:
         local('mkdir -p ' + kernels_dir + 'toree_' + args.cluster_name + '/')
         local('tar zxvf /tmp/toree_kernel.tar.gz -C ' + kernels_dir + 'toree_' 
+ args.cluster_name + '/')
-        local('sudo mv {0}toree_{1}/toree-0.2.0-incubating/* 
{0}toree_{1}/'.format(kernels_dir, args.cluster_name))
-        local('sudo rm -r 
{0}toree_{1}/toree-0.2.0-incubating'.format(kernels_dir, args.cluster_name))
+        local('sudo mv {0}toree_{1}/toree-0.3.0-incubating/* 
{0}toree_{1}/'.format(kernels_dir, args.cluster_name))
+        local('sudo rm -r 
{0}toree_{1}/toree-0.3.0-incubating'.format(kernels_dir, args.cluster_name))
         kernel_path = kernels_dir + "toree_" + args.cluster_name + 
"/kernel.json"
         template_file = "/tmp/toree_dataengine-service_templatev2.json"
         with open(template_file, 'r') as f:
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_dataengine-service_create_configs.py
 
b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_dataengine-service_create_configs.py
index 9bc8e37..3f10360 100644
--- 
a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_dataengine-service_create_configs.py
+++ 
b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_dataengine-service_create_configs.py
@@ -82,8 +82,8 @@ def toree_kernel(args):
     spark_path = '/opt/{0}/{1}/spark/'.format(args.dataproc_version, 
args.cluster_name)
     local('mkdir -p {0}toree_{1}/'.format(kernels_dir, args.cluster_name))
     local('tar zxvf /tmp/toree_kernel.tar.gz -C 
{0}toree_{1}/'.format(kernels_dir, args.cluster_name))
-    local('sudo mv {0}toree_{1}/toree-0.2.0-incubating/* 
{0}toree_{1}/'.format(kernels_dir, args.cluster_name))
-    local('sudo rm -r {0}toree_{1}/toree-0.2.0-incubating'.format(kernels_dir, 
args.cluster_name))
+    local('sudo mv {0}toree_{1}/toree-0.3.0-incubating/* 
{0}toree_{1}/'.format(kernels_dir, args.cluster_name))
+    local('sudo rm -r {0}toree_{1}/toree-0.3.0-incubating'.format(kernels_dir, 
args.cluster_name))
     kernel_path = '{0}toree_{1}/kernel.json'.format(kernels_dir, 
args.cluster_name)
     template_file = "/tmp/toree_dataengine-service_templatev2.json"
     with open(template_file, 'r') as f:
diff --git 
a/infrastructure-provisioning/src/general/scripts/os/jupyter_dataengine_create_configs.py
 
b/infrastructure-provisioning/src/general/scripts/os/jupyter_dataengine_create_configs.py
index 60a3246..d04e90e 100644
--- 
a/infrastructure-provisioning/src/general/scripts/os/jupyter_dataengine_create_configs.py
+++ 
b/infrastructure-provisioning/src/general/scripts/os/jupyter_dataengine_create_configs.py
@@ -82,8 +82,8 @@ def toree_kernel(args):
     scala_version = local('spark-submit --version 2>&1 | grep -o -P "Scala 
version \K.{0,7}"', capture=True)
     local('mkdir -p ' + kernels_dir + 'toree_' + args.cluster_name + '/')
     local('tar zxvf /tmp/{}/toree_kernel.tar.gz -C '.format(args.cluster_name) 
+ kernels_dir + 'toree_' + args.cluster_name + '/')
-    local('sudo mv {0}toree_{1}/toree-0.2.0-incubating/* 
{0}toree_{1}/'.format(kernels_dir, args.cluster_name))
-    local('sudo rm -r {0}toree_{1}/toree-0.2.0-incubating'.format(kernels_dir, 
args.cluster_name))
+    local('sudo mv {0}toree_{1}/toree-0.3.0-incubating/* 
{0}toree_{1}/'.format(kernels_dir, args.cluster_name))
+    local('sudo rm -r {0}toree_{1}/toree-0.3.0-incubating'.format(kernels_dir, 
args.cluster_name))
     kernel_path = kernels_dir + "toree_" + args.cluster_name + "/kernel.json"
     template_file = 
"/tmp/{}/toree_dataengine_template.json".format(args.cluster_name)
     with open(template_file, 'r') as f:
diff --git 
a/infrastructure-provisioning/src/jupyter/scripts/configure_jupyter_node.py 
b/infrastructure-provisioning/src/jupyter/scripts/configure_jupyter_node.py
index 94ad123..11b42cd 100644
--- a/infrastructure-provisioning/src/jupyter/scripts/configure_jupyter_node.py
+++ b/infrastructure-provisioning/src/jupyter/scripts/configure_jupyter_node.py
@@ -63,7 +63,7 @@ jars_dir = '/opt/jars/'
 templates_dir = '/root/templates/'
 files_dir = '/root/files/'
 local_spark_path = '/opt/spark/'
-toree_link = 
'http://archive.apache.org/dist/incubator/toree/0.2.0-incubating/toree-pip/toree-0.2.0.tar.gz'
+toree_link = 
'http://archive.apache.org/dist/incubator/toree/0.3.0-incubating/toree-pip/toree-0.3.0.tar.gz'
 r_libs = ['R6', 'pbdZMQ', 'RCurl', 'devtools', 'reshape2', 'caTools', 'rJava', 
'ggplot2']
 gitlab_certfile = os.environ['conf_gitlab_certfile']
 
diff --git 
a/infrastructure-provisioning/src/jupyterlab/scripts/configure_jupyterlab_node.py
 
b/infrastructure-provisioning/src/jupyterlab/scripts/configure_jupyterlab_node.py
index 1486ff3..f50de32 100644
--- 
a/infrastructure-provisioning/src/jupyterlab/scripts/configure_jupyterlab_node.py
+++ 
b/infrastructure-provisioning/src/jupyterlab/scripts/configure_jupyterlab_node.py
@@ -71,7 +71,7 @@ jars_dir = '/opt/jars/'
 templates_dir = '/root/templates/'
 files_dir = '/root/files/'
 local_spark_path = '/opt/spark/'
-toree_link = 
'http://archive.apache.org/dist/incubator/toree/0.2.0-incubating/toree-pip/toree-0.2.0.tar.gz'
+toree_link = 
'http://archive.apache.org/dist/incubator/toree/0.3.0-incubating/toree-pip/toree-0.3.0.tar.gz'
 r_libs = ['R6', 'pbdZMQ', 'RCurl', 'devtools', 'reshape2', 'caTools', 'rJava', 
'ggplot2']
 gitlab_certfile = os.environ['conf_gitlab_certfile']
 
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py 
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 727f97e..f0dd69a 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -58,13 +58,13 @@ def modify_conf_file(args):
 
 def download_toree():
     toree_path = 
'/opt/dlab/sources/infrastructure-provisioning/src/general/files/os/'
-    tarball_link = 
'https://archive.apache.org/dist/incubator/toree/0.2.0-incubating/toree/toree-0.2.0-incubating-bin.tar.gz'
-    jar_link = 
'https://repo1.maven.org/maven2/org/apache/toree/toree-assembly/0.2.0-incubating/toree-assembly-0.2.0-incubating.jar'
+    tarball_link = 
'https://archive.apache.org/dist/incubator/toree/0.3.0-incubating/toree/toree-0.3.0-incubating-bin.tar.gz'
+    jar_link = 
'https://repo1.maven.org/maven2/org/apache/toree/toree-assembly/0.3.0-incubating/toree-assembly-0.3.0-incubating.jar'
     try:
         run('wget {}'.format(tarball_link))
         run('wget {}'.format(jar_link))
-        run('mv toree-0.2.0-incubating-bin.tar.gz 
{}toree_kernel.tar.gz'.format(toree_path))
-        run('mv toree-assembly-0.2.0-incubating.jar 
{}toree-assembly-0.2.0.jar'.format(toree_path))
+        run('mv toree-0.3.0-incubating-bin.tar.gz 
{}toree_kernel.tar.gz'.format(toree_path))
+        run('mv toree-assembly-0.3.0-incubating.jar 
{}toree-assembly-0.3.0.jar'.format(toree_path))
     except Exception as err:
         traceback.print_exc()
         print('Failed to download toree: ', str(err))


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to