Skip to content

Commit 06caf54

Browse files
antoine-sachetjimhester
authored andcommitted
No longer pass credentials to dependencies
Effectively reverts some of #145. This will break the install of private dependencies for people who used the auth_token (or equivalent) argument. It is however easy and more robust to pass credentials to the deps via environment variables. Fixes #337
1 parent afe8608 commit 06caf54

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

NEWS.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# remotes (development version)
22

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

510
# remotes 2.0.3

R/deps.R

+4-4
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ local_package_deps <- function(pkgdir = ".", dependencies = NA) {
117117

118118
dev_package_deps <- function(pkgdir = ".", dependencies = NA,
119119
repos = getOption("repos"),
120-
type = getOption("pkgType"), ...) {
120+
type = getOption("pkgType")) {
121121

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

136136
combine_deps(
137137
package_deps(deps, repos = repos, type = type),
138-
remote_deps(pkg, ...))
138+
remote_deps(pkg))
139139
}
140140

141141
combine_deps <- function(cran_deps, remote_deps) {
@@ -500,13 +500,13 @@ split_remotes <- function(x) {
500500
}
501501

502502

503-
remote_deps <- function(pkg, ...) {
503+
remote_deps <- function(pkg) {
504504
if (!has_dev_remotes(pkg)) {
505505
return(NULL)
506506
}
507507

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

511511
package <- vapply(remote, function(x) remote_package_name(x), character(1), USE.NAMES = FALSE)
512512
installed <- vapply(package, function(x) local_sha(x), character(1), USE.NAMES = FALSE)

R/install.R

+4-8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ install <- function(pkgdir, dependencies, quiet, build, build_opts, upgrade,
2121
}
2222

2323
install_deps(pkgdir, dependencies = dependencies, quiet = quiet,
24-
build = build, build_opts = build_opts, upgrade = upgrade, repos = repos, type = type, ...)
24+
build = build, build_opts = build_opts, upgrade = upgrade, repos = repos, type = type)
2525

2626
if (isTRUE(build)) {
2727
dir <- tempfile()
@@ -163,15 +163,12 @@ install_deps <- function(pkgdir = ".", dependencies = NA,
163163
upgrade = c("default", "ask", "always", "never"),
164164
quiet = FALSE,
165165
build = TRUE,
166-
build_opts = c("--no-resave-data", "--no-manual", "--no-build-vignettes"),
167-
...) {
168-
166+
build_opts = c("--no-resave-data", "--no-manual", "--no-build-vignettes")) {
169167
packages <- dev_package_deps(
170168
pkgdir,
171169
repos = repos,
172170
dependencies = dependencies,
173-
type = type,
174-
...
171+
type = type
175172
)
176173

177174
dep_deps <- if (isTRUE(dependencies)) NA else dependencies
@@ -182,8 +179,7 @@ install_deps <- function(pkgdir = ".", dependencies = NA,
182179
quiet = quiet,
183180
upgrade = upgrade,
184181
build = build,
185-
build_opts = build_opts,
186-
...
182+
build_opts = build_opts
187183
)
188184
}
189185

man/install_deps.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/package_deps.Rd

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)