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 2021/07/02 09:40:05 UTC
[incubator-datalab] 01/03: [DATALAB-2448]: changed how devtools
dependencies are installed
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2448
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 4d77abe6818382909a0b196307d81109f48a5271
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Jun 30 14:17:57 2021 +0300
[DATALAB-2448]: changed how devtools dependencies are installed
---
infrastructure-provisioning/src/general/lib/os/fab.py | 7 +++++++
.../src/general/scripts/os/install_additional_libs.py | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index e1c1392..71e9c66 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -533,6 +533,13 @@ def install_r_pkg(requisites):
status = list()
error_parser = "ERROR:|error:|Cannot|failed|Please run|requires|Error|Skipping|couldn't find"
try:
+ if os.environ['conf_resource'] in ('dataengine-service'):
+ if os.environ['conf_cloud_provider'] in ('aws'):
+ manage_pkg('-y install', 'remote', 'libcurl libcurl-devel')
+ elif os.environ['conf_cloud_provider'] in ('gcp'):
+ # manage_pkg('-y build-dep', 'remote', 'libcurl4-gnutls-dev libxml2-dev')
+ manage_pkg('-y install', 'remote', 'libxml2-dev libcurl4-openssl-dev')
+ conn.sudo('R -e "install.packages(\'devtools\', repos = \'cloud.r-project.org\')"')
for r_pkg in requisites:
name, vers = r_pkg
version = vers
diff --git a/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py b/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
index cf443c5..1a9bf05 100644
--- a/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
@@ -104,13 +104,6 @@ if __name__ == "__main__":
or os.environ['application'] in ('rstudio', 'tensor-rstudio'):
try:
print('Installing R packages: {}'.format(pkgs['libraries']['r_pkg']))
- if os.environ['conf_resource'] in ('dataengine-service') :
- if os.environ['conf_cloud_provider'] in ('aws'):
- manage_pkg('-y install', 'remote', 'libcurl libcurl-devel')
- elif os.environ['conf_cloud_provider'] in ('gcp'):
- manage_pkg('-y build-dep', 'remote', 'libcurl4-gnutls-dev libxml2-dev')
- manage_pkg('-y install', 'remote', 'libcurl4-gnutls-dev libgit2-dev libxml2-dev')
- conn.sudo('R -e "install.packages(\'devtools\', repos = \'https://cloud.r-project.org\')"')
status = install_r_pkg(pkgs['libraries']['r_pkg'])
general_status = general_status + status
except KeyError:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org