Revert back changes

DESCRIPTION

@@ -86,4 +86,4 @@ Suggests:
     DSLite
 Encoding: UTF-8
 Language: en-GB
-Config/roxygen2/version: 8.0.0
+Config/roxygen2/version: 8.1.0

NAMESPACE

@@ -121,31 +121,41 @@ export(ds.var)
 export(ds.vectorCalc)
 export(subsetHelper)
 import(DSI)
-importFrom(DSI,datashield.aggregate)
-importFrom(DSI,datashield.assign)
+importFrom(DSI,
+  datashield.aggregate,
+  datashield.assign
+)
 importFrom(assertthat,assert_that)
-importFrom(cli,cli_abort)
-importFrom(cli,cli_alert_danger)
-importFrom(cli,cli_alert_info)
-importFrom(cli,cli_alert_success)
-importFrom(cli,cli_alert_warning)
-importFrom(cli,cli_end)
-importFrom(cli,cli_li)
-importFrom(cli,cli_ol)
-importFrom(cli,cli_text)
-importFrom(cli,cli_ul)
+importFrom(cli,
+  cli_abort,
+  cli_alert_danger,
+  cli_alert_info,
+  cli_alert_success,
+  cli_alert_warning,
+  cli_end,
+  cli_li,
+  cli_ol,
+  cli_text,
+  cli_ul
+)
 importFrom(data.table,.SD)
-importFrom(dplyr,"%>%")
-importFrom(dplyr,all_of)
-importFrom(dplyr,bind_rows)
-importFrom(dplyr,case_when)
-importFrom(dplyr,row_number)
-importFrom(dplyr,where)
-importFrom(purrr,map)
-importFrom(purrr,map_lgl)
-importFrom(purrr,pmap)
-importFrom(purrr,pmap_lgl)
-importFrom(stats,as.formula)
-importFrom(stats,na.omit)
-importFrom(stats,ts)
-importFrom(stats,weighted.mean)
+importFrom(dplyr,
+  "%>%",
+  all_of,
+  bind_rows,
+  case_when,
+  row_number,
+  where
+)
+importFrom(purrr,
+  map,
+  map_lgl,
+  pmap,
+  pmap_lgl
+)
+importFrom(stats,
+  as.formula,
+  na.omit,
+  ts,
+  weighted.mean
+)

armadillo_azure-pipelines.yml

@@ -635,10 +635,17 @@ jobs:
       echo -e "R sessionInfo(): ############"
       R -e 'sessionInfo()'
 
-      sudo apt install tree -y
+      echo -e "\n#############################"
+      echo -e "Server packages: ############"
+      curl -s -u admin:admin -X GET http://localhost:8080/packages -o - | jq '.'
+
+      echo -e "\n#############################"
+      echo -e "PWD: ############"
       pwd
+
       echo -e "\n#############################"
       echo -e "File tree: ##################"
+      sudo apt install tree -y
       tree $(Pipeline.Workspace)
 
     displayName: 'Environment info'

azure-pipelines.yml

@@ -551,8 +551,15 @@ jobs:
       echo -e "R sessionInfo(): ############"
       R -e 'sessionInfo()'
 
-      sudo apt install tree -y
+      echo -e "\n#############################"
+      echo -e "Server packages: ############"
+      R --no-echo -q -e "sink(nullfile(), type = c('output', 'message')); library(rjson); library(opalr); o <- opal.login('administrator','datashield_test&', url='http://localhost:8080/'); p <- oadmin.installed_packages(o); opal.logout(o); sink(NULL); cat(toJSON(p))" 2> /dev/null | jq '.'
+
+      echo -e "\n#############################"
+      echo -e "PWD: ############"
       pwd
+
+      sudo apt install tree -y
       echo -e "\n#############################"
       echo -e "File tree: ##################"
       tree $(Pipeline.Workspace)

opal_azure-pipelines.yml

@@ -551,8 +551,15 @@ jobs:
       echo -e "R sessionInfo(): ############"
       R -e 'sessionInfo()'
 
-      sudo apt install tree -y
+      echo -e "\n#############################"
+      echo -e "Server packages: ############"
+      R --no-echo -q -e "sink(nullfile(), type = c('output', 'message')); library(rjson); library(opalr); o <- opal.login('administrator','datashield_test&', url='http://localhost:8080/'); p <- oadmin.installed_packages(o); opal.logout(o); sink(NULL); cat(toJSON(p))" 2> /dev/null | jq '.'
+
+      echo -e "\n#############################"
+      echo -e "PWD: ############"
       pwd
+
+      sudo apt install tree -y
       echo -e "\n#############################"
       echo -e "File tree: ##################"
       tree $(Pipeline.Workspace)