Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# remotes (development version)

* Credentials are no longer passed to dependencies, as this breaks dependencies
which use different credentials or hosts. If you have relied on this behavior
a more robust way to provide the credentials is using the appropriate
environment variables, e.g. `GITHUB_PAT`, `BITBUCKET_USER` etc.
(@antoine-sachet, #345).
* The hash of bitbucket hosts is now correctly retrieved (@antoine-sachet, #344)

# remotes 2.0.3
Expand Down
8 changes: 4 additions & 4 deletions R/deps.R
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ local_package_deps <- function(pkgdir = ".", dependencies = NA) {

dev_package_deps <- function(pkgdir = ".", dependencies = NA,
repos = getOption("repos"),
type = getOption("pkgType"), ...) {
type = getOption("pkgType")) {

pkg <- load_pkg_description(pkgdir)
repos <- c(repos, parse_additional_repositories(pkg))
Expand All @@ -135,7 +135,7 @@ dev_package_deps <- function(pkgdir = ".", dependencies = NA,

combine_deps(
package_deps(deps, repos = repos, type = type),
remote_deps(pkg, ...))
remote_deps(pkg))
}

combine_deps <- function(cran_deps, remote_deps) {
Expand Down Expand Up @@ -500,13 +500,13 @@ split_remotes <- function(x) {
}


remote_deps <- function(pkg, ...) {
remote_deps <- function(pkg) {
if (!has_dev_remotes(pkg)) {
return(NULL)
}

dev_packages <- split_remotes(pkg[["remotes"]])
remote <- lapply(dev_packages, parse_one_remote, ...)
remote <- lapply(dev_packages, parse_one_remote)

package <- vapply(remote, function(x) remote_package_name(x), character(1), USE.NAMES = FALSE)
installed <- vapply(package, function(x) local_sha(x), character(1), USE.NAMES = FALSE)
Expand Down
12 changes: 4 additions & 8 deletions R/install.R
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ install <- function(pkgdir, dependencies, quiet, build, build_opts, upgrade,
}

install_deps(pkgdir, dependencies = dependencies, quiet = quiet,
build = build, build_opts = build_opts, upgrade = upgrade, repos = repos, type = type, ...)
build = build, build_opts = build_opts, upgrade = upgrade, repos = repos, type = type)

if (isTRUE(build)) {
dir <- tempfile()
Expand Down Expand Up @@ -163,15 +163,12 @@ install_deps <- function(pkgdir = ".", dependencies = NA,
upgrade = c("default", "ask", "always", "never"),
quiet = FALSE,
build = TRUE,
build_opts = c("--no-resave-data", "--no-manual", "--no-build-vignettes"),
...) {

build_opts = c("--no-resave-data", "--no-manual", "--no-build-vignettes")) {
packages <- dev_package_deps(
pkgdir,
repos = repos,
dependencies = dependencies,
type = type,
...
type = type
)

dep_deps <- if (isTRUE(dependencies)) NA else dependencies
Expand All @@ -182,8 +179,7 @@ install_deps <- function(pkgdir = ".", dependencies = NA,
quiet = quiet,
upgrade = upgrade,
build = build,
build_opts = build_opts,
...
build_opts = build_opts
)
}

Expand Down
2 changes: 1 addition & 1 deletion man/install_deps.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/package_deps.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.