[ARVADOS] updated: 1.1.2-272-g06e690a

Git user git at public.curoverse.com
Fri Feb 9 13:42:55 EST 2018


Summary of changes:
 doc/Rakefile        |  5 ++++-
 sdk/R/.Rbuildignore |  1 +
 sdk/R/README.Rmd    | 13 +++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

       via  06e690a125bf736d39f8994534cd7e75bb8bffad (commit)
      from  24e302ceb24fcf9f00340e1896729de45cde45dd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 06e690a125bf736d39f8994534cd7e75bb8bffad
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Feb 9 13:42:42 2018 -0500

    11876: Update installation instructions
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/doc/Rakefile b/doc/Rakefile
index 10bb8b9..eaa5410 100644
--- a/doc/Rakefile
+++ b/doc/Rakefile
@@ -28,7 +28,9 @@ end
 file "sdk/R/arvados/index.html" do |t|
   `which R`
   if $? == 0
-    STDERR.puts `R --quiet --vanilla -e 'pkgdown::build_site(pkg="../sdk/R/")' 2>&1`
+    Dir.chdir("../sdk/R/") do
+      STDERR.puts `R --quiet --vanilla -e 'pkgdown::build_site()' 2>&1`
+    end
     raise if $? != 0
     cp_r("../sdk/R/docs", "sdk/R/arvados")
   else
@@ -50,6 +52,7 @@ end
 task :clean do
   rm_rf "sdk/python/arvados"
   rm_rf "sdk/R/arvados"
+  rm_rf "../sdk/R/docs"
 end
 
 require "zenweb/tasks"
diff --git a/sdk/R/.Rbuildignore b/sdk/R/.Rbuildignore
index 4952b99..b9136fe 100644
--- a/sdk/R/.Rbuildignore
+++ b/sdk/R/.Rbuildignore
@@ -1,3 +1,4 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^docs$
+^pkgdown$
diff --git a/sdk/R/README.Rmd b/sdk/R/README.Rmd
index 8e14058..9c056a0 100644
--- a/sdk/R/README.Rmd
+++ b/sdk/R/README.Rmd
@@ -5,17 +5,18 @@ The API is not final and feedback is solicited from users on ways in which it co
 
 ### INSTALLATION
 
-1. Install the dependencies
+`install.packages("ArvadosR", repos=c("http://r.arvados.org", getOption("repos")["CRAN"]), dependencies=TRUE)`
 
-    `install.packages(c('R6', 'httr', 'stringr', 'jsonlite', 'curl', 'XML'))`
+Note: on Linux, you may have to install supporting packages.
 
-    If needed, you may have to install the supporting packages first.
-    On Linux, these are: libxml2-dev, libssl-dev, libcurl4-gnutls-dev or libcurl4-openssl-dev
+On Centos 7, this is:
 
+`yum install libxml2-devel openssl-devel curl-devel`
 
-2. Install the ArvardosR package
+On Debian, this is:
+
+`apt-get install build-essential libxml2-dev libssl-dev libcurl4-gnutls-dev`
 
-    `install.packages('http://r.arvados.org/ArvadosR_0.0.3.tar.gz', repos=NULL, type='source')`
 
 ### EXAMPLES OF USAGE
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list