This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new 1004984 [DATALAB-2548]: setting roxygen2 version to 7.1.1 and using
it in devtools
new 901231c Merge pull request #1287 from owlleg6/develop
1004984 is described below
commit 10049847492c8538ffc515fae49675440f4fccef
Author: oleh_mykolaishyn <[email protected]>
AuthorDate: Thu Sep 23 17:14:38 2021 +0300
[DATALAB-2548]: setting roxygen2 version to 7.1.1 and using it in devtools
---
infrastructure-provisioning/src/general/conf/datalab.ini | 2 ++
infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/conf/datalab.ini
b/infrastructure-provisioning/src/general/conf/datalab.ini
index 58e4e7b..41542ce 100644
--- a/infrastructure-provisioning/src/general/conf/datalab.ini
+++ b/infrastructure-provisioning/src/general/conf/datalab.ini
@@ -323,6 +323,8 @@ superset_version = 0.35.1
gcs_connector_version = 2.0.1
### Setuptools version
setuptools_version = 54.1.1
+### Roxygen2 version
+roxygen2_version = 7.1.1
#--- [emr] section contains all parameters that are using for emr provisioning
---#
[emr]
diff --git
a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
index 66bebfb..c520ea0 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -65,7 +65,7 @@ def ensure_r_local_kernel(spark_version, os_user,
templates_dir, kernels_dir):
datalab.fab.conn.sudo('\cp -f /tmp/r_template.json
{}/ir/kernel.json'.format(kernels_dir))
datalab.fab.conn.sudo('ln -s /opt/spark/ /usr/local/spark')
try:
- datalab.fab.conn.sudo('R -e
"install.packages(\'roxygen2\',repos=\'https://cloud.r-project.org\')"')
+ datalab.fab.conn.sudo('R -e
"devtools::install_version(\'roxygen2\', version = \'{}\', repos =
\'https://cloud.r-project.org\')"'.format(os.environ['notebook_roxygen2_version']))
datalab.fab.conn.sudo(''' bash -c 'cd
/usr/local/spark/R/lib/SparkR; R -e "devtools::check()"' ''')
except:
pass
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
