Use the new devtools

opencpu · Sep 9, 2015 · 9a69854 · 9a69854
1 parent 3c4ea8e
commit 9a69854
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,7 @@
 Package: opencpu
 Type: Package
 Title: A System for Embedded Scientific Computing and Reproducible Research with R
-Version: 1.5.0
-Date: 2015-05-15
+Version: 1.5.0.9000
 Author: Jeroen Ooms
 Maintainer: Jeroen Ooms <jeroen.ooms@stat.ucla.edu>
 License: Apache License 2.0
@@ -18,7 +17,7 @@ Imports:
     httpuv (>= 1.3),
     knitr (>= 1.6),
     jsonlite (>= 0.9.14),
-    devtools (>= 1.6.1),
+    devtools (>= 1.9.0.9000),
     httr (>= 0.3),
     brew,
     openssl

diff --git a/R/github_install.R b/R/github_install.R
@@ -1,6 +1,7 @@
-github_install <- function(repo, username, ref = "master", args = NULL, ...){
+github_install <- function(repo, username, ref = "master", args = NULL, upgrade_dependencies = FALSE, ...){
   #get args
   all_args <- list(...)
+  all_args$upgrade_dependencies <- upgrade_dependencies;
   all_args$repo <- paste(username, repo, sep="/");
   all_args$ref <- ref;