From aaa1fd34dd28503a603983b6b217fc80bda2c90d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Mon, 10 Sep 2018 21:07:35 +0100 Subject: [PATCH] Remove `threads` arg of `install_deps()` (#154) If `Ncpus` was also specified, that led to an error. Closes #153. --- NEWS.md | 3 +++ R/install.R | 4 ---- man/install_deps.Rd | 9 +++------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/NEWS.md b/NEWS.md index 91a257d9..db427495 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,9 @@ * `install_github()`'s previously deprecated `username` argument has been removed. (#142) +* `install_deps()`'s `threads` argument has been removed, use the `Ncpus` + argument instead (#153, #154) + # Development * Remotes can be forced to use only its internal code by setting the diff --git a/R/install.R b/R/install.R index 31135a8d..648bf632 100644 --- a/R/install.R +++ b/R/install.R @@ -102,8 +102,6 @@ safe_build_package <- function(pkgdir, build_opts, dest_path, quiet, use_pkgbuil #' Install package dependencies if needed. #' #' @inheritParams package_deps -#' @param threads Number of threads to start, passed to -#' \code{\link[utils]{install.packages}} as \code{Ncpus}. #' @param ... additional arguments passed to \code{\link[utils]{install.packages}}. #' @param build If \code{TRUE} build the pacakge before installing. #' @param build_opts Options to pass to `R CMD build`. @@ -112,7 +110,6 @@ safe_build_package <- function(pkgdir, build_opts, dest_path, quiet, use_pkgbuil #' \dontrun{install_deps(".")} install_deps <- function(pkgdir = ".", dependencies = NA, - threads = getOption("Ncpus", 1), repos = getOption("repos"), type = getOption("pkgType"), ..., @@ -135,7 +132,6 @@ install_deps <- function(pkgdir = ".", dependencies = NA, packages, dependencies = dep_deps, ..., - Ncpus = threads, quiet = quiet, upgrade = upgrade, build = build, diff --git a/man/install_deps.Rd b/man/install_deps.Rd index f7857362..7ddbf1be 100644 --- a/man/install_deps.Rd +++ b/man/install_deps.Rd @@ -5,9 +5,9 @@ \title{Install package dependencies if needed.} \usage{ install_deps(pkgdir = ".", dependencies = NA, - threads = getOption("Ncpus", 1), repos = getOption("repos"), - type = getOption("pkgType"), ..., upgrade = TRUE, quiet = FALSE, - build = TRUE, build_opts = c("--no-resave-data", "--no-manual", + repos = getOption("repos"), type = getOption("pkgType"), ..., + upgrade = TRUE, quiet = FALSE, build = TRUE, + build_opts = c("--no-resave-data", "--no-manual", "--no-build-vignettes")) } \arguments{ @@ -22,9 +22,6 @@ install_deps(pkgdir = ".", dependencies = NA, and is the default. \code{FALSE} is shorthand for no dependencies (i.e. just check this package, not its dependencies).} -\item{threads}{Number of threads to start, passed to -\code{\link[utils]{install.packages}} as \code{Ncpus}.} - \item{repos}{A character vector giving repositories to use.} \item{type}{Type of package to \code{update}.}