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 2020/12/16 08:17:34 UTC
[incubator-datalab] branch DATALAB-2189 created (now f8a89ba)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DATALAB-2189
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at f8a89ba [DATALAB-2190]: made catools variable lowercase
This branch includes the following new commits:
new f8a89ba [DATALAB-2190]: made catools variable lowercase
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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: [DATALAB-2190]: made catools variable
lowercase
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2189
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit f8a89bab0349d584b8676f52f80362bdd7018697
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Dec 16 10:17:14 2020 +0200
[DATALAB-2190]: made catools variable lowercase
---
.../src/dataengine/scripts/configure_dataengine.py | 2 +-
infrastructure-provisioning/src/general/conf/datalab.ini | 2 +-
.../src/jupyterlab/scripts/configure_jupyterlab_node.py | 2 +-
.../src/rstudio/scripts/configure_rstudio_node.py | 2 +-
.../src/tensor-rstudio/scripts/configure_tensor-rstudio_node.py | 2 +-
.../src/zeppelin/scripts/configure_zeppelin_node.py | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py b/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
index 7b094c0..1d299a1 100644
--- a/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
+++ b/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
@@ -71,7 +71,7 @@ templates_dir = '/root/templates/'
files_dir = '/root/files/'
local_spark_path = '/opt/spark/'
jars_dir = '/opt/jars/'
-r_libs = ['R6', 'pbdZMQ', 'RCurl', 'reshape2', 'caTools={}'.format(os.environ['notebook_caTools_version']), 'rJava', 'ggplot2']
+r_libs = ['R6', 'pbdZMQ', 'RCurl', 'reshape2', 'caTools={}'.format(os.environ['notebook_catools_version']), 'rJava', 'ggplot2']
if os.environ['application'] == 'deeplearning':
tensorflow_version = '1.4.0'
cuda_version = '8.0'
diff --git a/infrastructure-provisioning/src/general/conf/datalab.ini b/infrastructure-provisioning/src/general/conf/datalab.ini
index dd9b9d1..e74760c 100644
--- a/infrastructure-provisioning/src/general/conf/datalab.ini
+++ b/infrastructure-provisioning/src/general/conf/datalab.ini
@@ -295,7 +295,7 @@ numpy_version = 1.18.3
### Numpy version for python 2
numpy2_version = 1.16.6
### caTools version for R 3.4.4
-caTools_version = 1.17.1.4
+catools_version = 1.17.1.4
### Apache Ivy version
ivy_version = 2.4.0
### Matplotlib version
diff --git a/infrastructure-provisioning/src/jupyterlab/scripts/configure_jupyterlab_node.py b/infrastructure-provisioning/src/jupyterlab/scripts/configure_jupyterlab_node.py
index 6ac62ed..0e317b2 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 @@ templates_dir = '/root/templates/'
files_dir = '/root/files/'
local_spark_path = '/opt/spark/'
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', 'reshape2', 'caTools={}'.format(os.environ['notebook_caTools_version']), 'rJava', 'ggplot2']
+r_libs = ['R6', 'pbdZMQ', 'RCurl', 'reshape2', 'caTools={}'.format(os.environ['notebook_catools_version']), 'rJava', 'ggplot2']
gitlab_certfile = os.environ['conf_gitlab_certfile']
diff --git a/infrastructure-provisioning/src/rstudio/scripts/configure_rstudio_node.py b/infrastructure-provisioning/src/rstudio/scripts/configure_rstudio_node.py
index 7367101..9cb01a0 100644
--- a/infrastructure-provisioning/src/rstudio/scripts/configure_rstudio_node.py
+++ b/infrastructure-provisioning/src/rstudio/scripts/configure_rstudio_node.py
@@ -56,7 +56,7 @@ local_spark_path = '/opt/spark/'
jars_dir = '/opt/jars/'
templates_dir = '/root/templates/'
files_dir = '/root/files/'
-r_libs = ['R6', 'pbdZMQ', 'RCurl', 'reshape2', 'caTools={}'.format(os.environ['notebook_caTools_version']), 'rJava', 'ggplot2', 'evaluate', 'formatR', 'yaml',
+r_libs = ['R6', 'pbdZMQ', 'RCurl', 'reshape2', 'caTools={}'.format(os.environ['notebook_catools_version']), 'rJava', 'ggplot2', 'evaluate', 'formatR', 'yaml',
'Rcpp', 'rmarkdown', 'base64enc', 'tibble', 'sparklyr']
gitlab_certfile = os.environ['conf_gitlab_certfile']
diff --git a/infrastructure-provisioning/src/tensor-rstudio/scripts/configure_tensor-rstudio_node.py b/infrastructure-provisioning/src/tensor-rstudio/scripts/configure_tensor-rstudio_node.py
index 1b97f67..7f65897 100644
--- a/infrastructure-provisioning/src/tensor-rstudio/scripts/configure_tensor-rstudio_node.py
+++ b/infrastructure-provisioning/src/tensor-rstudio/scripts/configure_tensor-rstudio_node.py
@@ -65,7 +65,7 @@ jars_dir = '/opt/jars/'
templates_dir = '/root/templates/'
files_dir = '/root/files/'
gitlab_certfile = os.environ['conf_gitlab_certfile']
-r_libs = ['R6', 'pbdZMQ', 'RCurl', 'reshape2', 'caTools={}'.format(os.environ['notebook_caTools_version']), 'rJava', 'ggplot2', 'evaluate', 'formatR', 'yaml',
+r_libs = ['R6', 'pbdZMQ', 'RCurl', 'reshape2', 'caTools={}'.format(os.environ['notebook_catools_version']), 'rJava', 'ggplot2', 'evaluate', 'formatR', 'yaml',
'Rcpp', 'rmarkdown', 'base64enc', 'tibble', 'tensorflow']
diff --git a/infrastructure-provisioning/src/zeppelin/scripts/configure_zeppelin_node.py b/infrastructure-provisioning/src/zeppelin/scripts/configure_zeppelin_node.py
index cc4ecca..3d8c254 100644
--- a/infrastructure-provisioning/src/zeppelin/scripts/configure_zeppelin_node.py
+++ b/infrastructure-provisioning/src/zeppelin/scripts/configure_zeppelin_node.py
@@ -71,7 +71,7 @@ local_spark_path = '/opt/spark/'
templates_dir = '/root/templates/'
files_dir = '/root/files/'
jars_dir = '/opt/jars/'
-r_libs = ['R6', 'pbdZMQ', 'RCurl', 'reshape2', 'caTools={}'.format(os.environ['notebook_caTools_version']), 'rJava', 'ggplot2']
+r_libs = ['R6', 'pbdZMQ', 'RCurl', 'reshape2', 'caTools={}'.format(os.environ['notebook_catools_version']), 'rJava', 'ggplot2']
r_enabled = os.environ['notebook_r_enabled']
gitlab_certfile = os.environ['conf_gitlab_certfile']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org